net: remove a dubious unlikely() clause
authorEric Dumazet <edumazet@google.com>
Sun, 20 Mar 2016 18:27:47 +0000 (11:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Mar 2016 20:24:07 +0000 (16:24 -0400)
TCP protocol is still used these days, and TCP uses
clones in its transmit path. We can not optimize linux
stack assuming it is mostly used in routers, or that TCP
is dead.

Fixes: 795bb1c00d ("net: bulk free infrastructure for NAPI context, use napi_consume_skb")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c

index f044f970f1a63c9040ec7c763e2b19a690b55269..d04c2d1c8c87d79e89fa9f2a4de97ea9262a7787 100644 (file)
@@ -815,7 +815,7 @@ void napi_consume_skb(struct sk_buff *skb, int budget)
        trace_consume_skb(skb);
 
        /* if SKB is a clone, don't handle this case */
-       if (unlikely(skb->fclone != SKB_FCLONE_UNAVAILABLE)) {
+       if (skb->fclone != SKB_FCLONE_UNAVAILABLE) {
                __kfree_skb(skb);
                return;
        }
This page took 0.027701 seconds and 5 git commands to generate.