From mboxrd@z Thu Jan 1 00:00:00 1970 From: Frank Lee Subject: Re: [PATCH] net: skbuff.h: remove unnecessary unlikely() Date: Mon, 5 Nov 2018 21:21:50 +0800 Message-ID: References: <20181104131444.4049-1-tiny.windzz@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org To: davem@davemloft.net, Eric Dumazet , Willem de Bruijn , dja@axtens.net, ast@kernel.org, sbrivio@redhat.com, pabeni@redhat.com Return-path: In-Reply-To: <20181104131444.4049-1-tiny.windzz@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org add netdev@vger.kernel.org -- Yangtao On Sun, Nov 4, 2018 at 9:14 PM Yangtao Li wrote: > > 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 >