From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yangtao Li Subject: [PATCH] net: skbuff.h: remove unnecessary unlikely() Date: Tue, 6 Nov 2018 10:45:36 -0500 Message-ID: <20181106154536.8789-1-tiny.windzz@gmail.com> Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Yangtao Li To: davem@davemloft.net, edumazet@google.com, dja@axtens.net, willemb@google.com, ast@kernel.org, sbrivio@redhat.com, posk@google.com, pabeni@redhat.com, borisp@mellanox.com Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org WARN_ON() already contains an unlikely(), so it's not necessary to use unlikely. Signed-off-by: Yangtao Li --- 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