Merge branch 'switchdev-obj'

Browse source

Jiri Pirko says:

====================
switchdev: bring back switchdev_obj

Second version of the patch extends to a patchset. Basically this patchset
brings object structure back which disappeared with recent Vivien's patchset.
Also it does a bit of naming changes in order to get the things in line.
Also, object id is put back into object structure.
Thanks to Scott and Vivien for review and suggestions.
====================

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

...

This commit is contained in:

David S. Miller 2015-10-03 04:49:48 -07:00

parent c3fc7ac9a0 9e8f4a548a

commit bd8762bec9

11 changed files with 199 additions and 160 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

15

Documentation/networking/switchdev.txt

View file

2

drivers/net/ethernet/mellanox/mlxsw/switchx2.c

View file

80

drivers/net/ethernet/rocker/rocker.c

View file

76

include/net/switchdev.h

View file

5

net/bridge/br_fdb.c

View file

2

net/bridge/br_stp.c

View file

10

net/bridge/br_vlan.c

View file

2

net/core/net-sysfs.c

View file

2

net/core/rtnetlink.c

View file

72

net/dsa/slave.c

View file

93

net/switchdev/switchdev.c

View file