net: Pass NULL to skb_network_protocol() when we don't care about vlan depth
authorMiaohe Lin <linmiaohe@huawei.com>
Sat, 1 Aug 2020 09:36:05 +0000 (17:36 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Aug 2020 22:38:31 +0000 (15:38 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c

index 97ad652..2828f6d 100644 (file)
@@ -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);