| Message ID | 1600482287-46754-1-git-send-email-linyunsheng@huawei.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] net: remove unnecessary NULL checking in napi_consume_skb() | expand |
From: Yunsheng Lin <linyunsheng@huawei.com> Date: Sat, 19 Sep 2020 10:24:47 +0800 > 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> Applied.
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index bfd7483..e077447 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -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);
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> --- net/core/skbuff.c | 3 --- 1 file changed, 3 deletions(-)