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

Commit 72f4af4e authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: export also pvid flag in the xstats flags 



When I added support to export the vlan entry flags via xstats I forgot to
add support for the pvid since it is manually matched, so check if the
entry matches the vlan_group's pvid and set the flag appropriately.

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

net/bridge/br_netlink.c

+5 −0
Original line number Diff line number Diff line
@@ -1313,6 +1313,9 @@ static int br_fill_linkxstats(struct sk_buff *skb, 
		return -EMSGSIZE;



	if (vg) {

		u16 pvid;



		pvid = br_get_pvid(vg);

		list_for_each_entry(v, &vg->vlan_list, vlist) {

			struct bridge_vlan_xstats vxi;

			struct br_vlan_stats stats;
@@ -1322,6 +1325,8 @@ static int br_fill_linkxstats(struct sk_buff *skb, 
			memset(&vxi, 0, sizeof(vxi));

			vxi.vid = v->vid;

			vxi.flags = v->flags;

			if (v->vid == pvid)

				vxi.flags |= BRIDGE_VLAN_INFO_PVID;

			br_vlan_get_stats(v, &stats);

			vxi.rx_bytes = stats.rx_bytes;

			vxi.rx_packets = stats.rx_packets;