Message ID | 1596274223-24555-1-git-send-email-linmiaohe@huawei.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | net: Use __skb_pagelen() directly in skb_cow_data() | expand |
From: linmiaohe <linmiaohe@huawei.com> Date: Sat, 1 Aug 2020 17:30:23 +0800 > From: Miaohe Lin <linmiaohe@huawei.com> > > In fact, skb_pagelen() - skb_headlen() is equal to __skb_pagelen(), use it > directly to avoid unnecessary skb_headlen() call. > > Also fix the CHECK note of checkpatch.pl: > Comparison to NULL could be written "!__pskb_pull_tail" > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Applied.
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b8afefe6f6b6..3219c26ddfae 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4413,7 +4413,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer) * at the moment even if they are anonymous). */ if ((skb_cloned(skb) || skb_shinfo(skb)->nr_frags) && - __pskb_pull_tail(skb, skb_pagelen(skb)-skb_headlen(skb)) == NULL) + !__pskb_pull_tail(skb, __skb_pagelen(skb))) return -ENOMEM; /* Easy case. Most of packets will go this way. */