Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / net / strparser / strparser.c

diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c
index 860dcfb95ee472fed5d74e6015af2acce178c0a7..0ba363624339c9d21b2bc06418750cd952949d54 100644 (file)
--- a/net/strparser/strparser.c
+++ b/net/strparser/strparser.c
@@ -140,13 +140,11 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb,
                        /* We are going to append to the frags_list of head.
                         * Need to unshare the frag_list.
                         */
-                       if (skb_has_frag_list(head)) {
-                               err = skb_unclone(head, GFP_ATOMIC);
-                               if (err) {
-                                       STRP_STATS_INCR(strp->stats.mem_fail);
-                                       desc->error = err;
-                                       return 0;
-                               }
+                       err = skb_unclone(head, GFP_ATOMIC);
+                       if (err) {
+                               STRP_STATS_INCR(strp->stats.mem_fail);
+                               desc->error = err;
+                               return 0;
                        }
 
                        if (unlikely(skb_shinfo(head)->frag_list)) {
@@ -299,7 +297,7 @@ static int __strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb,
                        break;
                }
 
-               /* Positive extra indicates ore bytes than needed for the
+               /* Positive extra indicates more bytes than needed for the
                 * message
                 */