Merge branch 'bridge-vlan'

Browse source

Nikolay Aleksandrov says:

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

This is the second follow-up set with one fix (patch 01) and more cleanups
(patches 02,03 and 04). These are minor compared to the previous ones and
should be the last before taking on the optimization changes on the
fast-path.
====================

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

...

This commit is contained in:

David S. Miller 2015-10-04 16:43:56 -07:00

parent e96f78ab27 6be144f62f

commit 68d4e52082

3 changed files with 66 additions and 48 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

10

net/bridge/br_netlink.c

View file

2

net/bridge/br_private.h

View file

102

net/bridge/br_vlan.c

View file