net: remove a dubious unlikely() clause

Eric Dumazet · davem330 · commit abbdb5a74cea · 2016-03-20T16:24:07.000-04:00
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: 795bb1c ("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>
diff --git 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;
 	}

Original file line number	Diff line number	Diff line change
`@@ -815,7 +815,7 @@ void napi_consume_skb(struct sk_buff *skb, int budget)`
`815`	`815`	`trace_consume_skb(skb);`
`816`	`816`
`817`	`817`	`/* if SKB is a clone, don't handle this case */`
`818`		`- if (unlikely(skb->fclone != SKB_FCLONE_UNAVAILABLE)) {`
	`818`	`+ if (skb->fclone != SKB_FCLONE_UNAVAILABLE) {`
`819`	`819`	`__kfree_skb(skb);`
`820`	`820`	`return;`
`821`	`821`	`}`