]> git.itanic.dy.fi Git - linux-stable/commitdiff
net: remove unnecessary NULL checking in napi_consume_skb()
authorYunsheng Lin <linyunsheng@huawei.com>
Sat, 19 Sep 2020 02:24:47 +0000 (10:24 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 20 Sep 2020 21:17:20 +0000 (14:17 -0700)
When budget is non-zero, skb_unref() has already handled the
NULL checking.

When budget is zero, the dev_consume_skb_any() has handled NULL
checking in __dev_kfree_skb_irq(), or dev_kfree_skb() which also
ultimately call skb_unref().

So remove the unnecessary checking in napi_consume_skb().

Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c

index bfd748346f208b9b7aec8d68646b7b5c1eb37653..e0774471f56d5f8095e446cc3b45098865e6dae2 100644 (file)
@@ -895,9 +895,6 @@ void __kfree_skb_defer(struct sk_buff *skb)
 
 void napi_consume_skb(struct sk_buff *skb, int budget)
 {
-       if (unlikely(!skb))
-               return;
-
        /* Zero budget indicate non-NAPI context called us, like netpoll */
        if (unlikely(!budget)) {
                dev_consume_skb_any(skb);