Message ID | 1596274565-24655-1-git-send-email-linmiaohe@huawei.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | net: Pass NULL to skb_network_protocol() when we don't care about vlan depth | expand |
From: linmiaohe <linmiaohe@huawei.com> Date: Sat, 1 Aug 2020 17:36:05 +0800 > From: Miaohe Lin <linmiaohe@huawei.com> > > When we don't care about vlan depth, we could pass NULL instead of the > address of a unused local variable to skb_network_protocol() as a param. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Applied.
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 3219c26ddfae..8a0c39e4ab0a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3758,7 +3758,6 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, int err = -ENOMEM; int i = 0; int pos; - int dummy; if (list_skb && !list_skb->head_frag && skb_headlen(list_skb) && (skb_shinfo(head_skb)->gso_type & SKB_GSO_DODGY)) { @@ -3780,7 +3779,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, } __skb_push(head_skb, doffset); - proto = skb_network_protocol(head_skb, &dummy); + proto = skb_network_protocol(head_skb, NULL); if (unlikely(!proto)) return ERR_PTR(-EINVAL);