diff options
| author | Eric Dumazet <edumazet@google.com> | 2016-03-20 11:27:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-20 16:24:07 -0400 |
| commit | abbdb5a74cead60e20b79c960c1772955f0b6b81 (patch) | |
| tree | 3186ffe72f3d5fdf46023d453ac2fa2dc780a83e /net/core/skbuff.c | |
| parent | 5a779c4feda5d52e0f19e48af71b75dd1032a5b8 (diff) | |
| download | linux-abbdb5a74cead60e20b79c960c1772955f0b6b81.tar.gz linux-abbdb5a74cead60e20b79c960c1772955f0b6b81.tar.bz2 linux-abbdb5a74cead60e20b79c960c1772955f0b6b81.zip | |
net: remove a dubious unlikely() clause
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>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f044f970f1a6..d04c2d1c8c87 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -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; } |