Messages in this thread | | | From | Frank Lee <> | Date | Tue, 6 Nov 2018 00:02:14 +0800 | Subject | Re: [PATCH] net: skbuff.h: remove unnecessary unlikely() |
| |
add myself. -Yangtao On Mon, Nov 5, 2018 at 9:21 PM Frank Lee <tiny.windzz@gmail.com> wrote: > > add netdev@vger.kernel.org > -- Yangtao > On Sun, Nov 4, 2018 at 9:14 PM Yangtao Li <tiny.windzz@gmail.com> wrote: > > > > 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 > >
| |