Message ID | 1596106956-22054-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: Thu, 30 Jul 2020 19:02:36 +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 to net-next, thanks.
diff --git a/net/core/dev.c b/net/core/dev.c index 7a774ebf64e2..474da11d18c9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3448,10 +3448,9 @@ static netdev_features_t net_mpls_features(struct sk_buff *skb, static netdev_features_t harmonize_features(struct sk_buff *skb, netdev_features_t features) { - int tmp; __be16 type; - type = skb_network_protocol(skb, &tmp); + type = skb_network_protocol(skb, NULL); features = net_mpls_features(skb, features, type); if (skb->ip_summed != CHECKSUM_NONE &&