Commit 6c4110d9 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Jakub Kicinski
Browse files

net: bridge: vlan: fix global vlan option range dumping 



When global vlan options are equal sequentially we compress them in a
range to save space and reduce processing time. In order to have the
proper range end id we need to update range_end if the options are equal
otherwise we get ranges with the same end vlan id as the start.

Fixes: 743a53d9 ("net: bridge: vlan: add support for dumping global vlan options")
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Link: https://lore.kernel.org/r/20210810092139.11700-1-razor@blackwall.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 83f0a0b7

net/bridge/br_vlan.c

+2 −1
Original line number Diff line number Diff line
@@ -2019,7 +2019,7 @@ static int br_vlan_dump_dev(const struct net_device *dev, 


		if (dump_global) {

			if (br_vlan_global_opts_can_enter_range(v, range_end))

				continue;

				goto update_end;

			if (!br_vlan_global_opts_fill(skb, range_start->vid,

						      range_end->vid,

						      range_start)) {
@@ -2045,6 +2045,7 @@ static int br_vlan_dump_dev(const struct net_device *dev, 


			range_start = v;

		}

update_end:

		range_end = v;

	}