Merge branch 'bridge-vlan'

Browse source

Nikolay Aleksandrov says:

====================
bridge: vlan: cleanups & fixes (part 3)

Patch 01 converts the vlgrp member to use rcu as it was already used in a
similar way so better to make it official and use all the available RCU
instrumentation. Patch 02 fixes a bug where the vlan_list can be traversed
without rtnl or rcu held which could lead to using freed entries.
Patch 03 removes some redundant code that isn't needed anymore.
Patch 04 fixes a bug reported by Ido Schimmel about the vlan_flush order
and switchdevs, it moves it back.

v2: patch 03 and 04 are new, couldn't escape the second synchronize_rcu()
since the rhtable destruction can sleep
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2015-10-13 04:58:04 -07:00

parent 4b918163ae f409d0ed87

commit bbb300eb97

7 changed files with 135 additions and 71 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/bridge/br_device.c

View file

6

net/bridge/br_forward.c

View file

3

net/bridge/br_if.c

View file

4

net/bridge/br_input.c

View file

25

net/bridge/br_netlink.c

View file

33

net/bridge/br_private.h

View file

133

net/bridge/br_vlan.c

View file