Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ba1a2d authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: export vlan flags with the stats 



Use one of the vlan xstats padding fields to export the vlan flags. This is
needed in order to be able to distinguish between master (bridge) and port
vlan entries in user-space when dumping the bridge vlan stats.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5ff8c41

include/uapi/linux/if_bridge.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,7 @@ struct bridge_vlan_xstats { 
	__u64 tx_bytes;

	__u64 tx_bytes;

	__u64 tx_packets;

	__u64 tx_packets;

	__u16 vid;

	__u16 vid;

	__u16 pad1;

	__u16 flags;

	__u32 pad2;

	__u32 pad2;

};

};

net/bridge/br_netlink.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1321,6 +1321,7 @@ static int br_fill_linkxstats(struct sk_buff *skb, 
				continue;

				continue;

			memset(&vxi, 0, sizeof(vxi));

			memset(&vxi, 0, sizeof(vxi));

			vxi.vid = v->vid;

			vxi.vid = v->vid;

			vxi.flags = v->flags;

			br_vlan_get_stats(v, &stats);

			br_vlan_get_stats(v, &stats);

			vxi.rx_bytes = stats.rx_bytes;

			vxi.rx_bytes = stats.rx_bytes;

			vxi.rx_packets = stats.rx_packets;

			vxi.rx_packets = stats.rx_packets;