diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-04-15 10:26:00 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-04-15 10:26:00 +0300 |
| commit | edf45f007a31e86738f6be3065591ddad94477d1 (patch) | |
| tree | 2805eeead7a03344a2b1185314d791a65fe15dc1 /net/core | |
| parent | caf968b483351d8825e68b06d77de5eb618aeb64 (diff) | |
| parent | d20339fa93e9810fcf87518bdd62e44f62bb64ee (diff) | |
| download | linux-edf45f007a31e86738f6be3065591ddad94477d1.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/flow_dissector.c | 3 | ||||
| -rw-r--r-- | net/core/rtnetlink.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 03b6e649c428..6f7ec72016dc 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -1032,7 +1032,7 @@ bool __skb_flow_dissect(const struct net *net, key_eth_addrs = skb_flow_dissector_target(flow_dissector, FLOW_DISSECTOR_KEY_ETH_ADDRS, target_container); - memcpy(key_eth_addrs, ð->h_dest, sizeof(*key_eth_addrs)); + memcpy(key_eth_addrs, eth, sizeof(*key_eth_addrs)); } proto_again: @@ -1183,6 +1183,7 @@ proto_again: VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT; } key_vlan->vlan_tpid = saved_vlan_tpid; + key_vlan->vlan_eth_type = proto; } fdret = FLOW_DISSECT_RET_PROTO_AGAIN; diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index ab7fb9a16da9..8bf770a7261e 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -5309,6 +5309,8 @@ static int rtnl_offload_xstats_fill(struct sk_buff *skb, struct net_device *dev, *prividx = attr_id_l3_stats; size_l3 = rtnl_offload_xstats_get_size_stats(dev, t_l3); + if (!size_l3) + goto skip_l3_stats; attr = nla_reserve_64bit(skb, attr_id_l3_stats, size_l3, IFLA_OFFLOAD_XSTATS_UNSPEC); if (!attr) @@ -5320,6 +5322,7 @@ static int rtnl_offload_xstats_fill(struct sk_buff *skb, struct net_device *dev, return err; have_data = true; +skip_l3_stats: *prividx = 0; } |