Merge branch 'swdev_ops'

Browse source

Scott Feldman says:

====================
switchdev: add swdev ops

v3:

 - Fix missing include for DSA build

v2:

 - Per Simon's review, squash some of the dependent commits into one to
   make series git bisect safe.

v1:

Per discussions at netconf, move switchdev ndo ops to a new swdev_ops to
keep ndo namespace clean and maintain switchdev-related ops into one place.

There are no functional changes here; just shuffling ops around for better
organization.
====================

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

...

This commit is contained in:

David S. Miller 2015-03-16 00:14:47 -04:00

parent 7993d44ea1 812a1c3ff3

commit f00bbd219c

5 changed files with 105 additions and 89 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

102

drivers/net/ethernet/rocker/rocker.c

View file

41

include/linux/netdevice.h

View file

38

include/net/switchdev.h

View file

9

net/dsa/slave.c

View file

42

net/switchdev/switchdev.c

View file