]>
Commit | Line | Data |
---|---|---|
0ee3da53 GKH |
1 | From foo@baz Sat Apr 20 16:43:09 CEST 2019 |
2 | From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | |
3 | Date: Tue, 16 Apr 2019 16:15:56 +0300 | |
4 | Subject: net: bridge: fix netlink export of vlan_stats_per_port option | |
5 | ||
6 | From: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | |
7 | ||
8 | [ Upstream commit 600bea7dba1a72874ae0cd9bc66bf2abfe43b49d ] | |
9 | ||
10 | Since the introduction of the vlan_stats_per_port option the netlink | |
11 | export of it has been broken since I made a typo and used the ifla | |
12 | attribute instead of the bridge option to retrieve its state. | |
13 | Sysfs export is fine, only netlink export has been affected. | |
14 | ||
15 | Fixes: 9163a0fc1f0c0 ("net: bridge: add support for per-port vlan stats") | |
16 | Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | |
17 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | --- | |
20 | net/bridge/br_netlink.c | 2 +- | |
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
22 | ||
23 | --- a/net/bridge/br_netlink.c | |
24 | +++ b/net/bridge/br_netlink.c | |
25 | @@ -1441,7 +1441,7 @@ static int br_fill_info(struct sk_buff * | |
26 | nla_put_u8(skb, IFLA_BR_VLAN_STATS_ENABLED, | |
27 | br_opt_get(br, BROPT_VLAN_STATS_ENABLED)) || | |
28 | nla_put_u8(skb, IFLA_BR_VLAN_STATS_PER_PORT, | |
29 | - br_opt_get(br, IFLA_BR_VLAN_STATS_PER_PORT))) | |
30 | + br_opt_get(br, BROPT_VLAN_STATS_PER_PORT))) | |
31 | return -EMSGSIZE; | |
32 | #endif | |
33 | #ifdef CONFIG_BRIDGE_IGMP_SNOOPING |