netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: skbuff.h: remove unnecessary unlikely()
@ 2018-11-06 15:45 Yangtao Li
  2018-11-06 19:22 ` David Miller
  0 siblings, 1 reply; 5+ messages in thread
From: Yangtao Li @ 2018-11-06 15:45 UTC (permalink / raw)
  To: davem, edumazet, dja, willemb, ast, sbrivio, posk, pabeni, borisp
  Cc: linux-kernel, netdev, Yangtao Li

WARN_ON() already contains an unlikely(), so it's not necessary to use
unlikely.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
 include/linux/skbuff.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 0ba687454267..7dcfb5591dc3 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2508,10 +2508,8 @@ int ___pskb_trim(struct sk_buff *skb, unsigned int len);
 
 static inline void __skb_set_length(struct sk_buff *skb, unsigned int len)
 {
-	if (unlikely(skb_is_nonlinear(skb))) {
-		WARN_ON(1);
+	if (WARN_ON(skb_is_nonlinear(skb)))
 		return;
-	}
 	skb->len = len;
 	skb_set_tail_pointer(skb, len);
 }
-- 
2.17.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread
[parent not found: <20181104131444.4049-1-tiny.windzz@gmail.com>]

end of thread, other threads:[~2018-11-06 19:22 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-06 15:45 [PATCH] net: skbuff.h: remove unnecessary unlikely() Yangtao Li
2018-11-06 19:22 ` David Miller
     [not found] <20181104131444.4049-1-tiny.windzz@gmail.com>
2018-11-05 13:21 ` Frank Lee
2018-11-05 16:02   ` Frank Lee
2018-11-05 18:09   ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).