Merge branch 'rocker-master-change'

Browse source

Jiri Pirko says:

====================
rocker: make master change handling nicer

Jiri Pirko (6):
  net: introduce change upper device notifier change info
  net: add netif_is_bridge_master helper
  net: add netif_is_ovs_master helper with IFF_OPENVSWITCH private flag
  net: kill long time unused bonding private flags
  rocker: use new helper to figure out master kind
  rocker: use change upper info
====================

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

...

This commit is contained in:

David S. Miller 2015-08-27 16:28:35 -07:00

parent 547c890cfd 686ed3047e

commit ec5d165555

4 changed files with 97 additions and 70 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

76

drivers/net/ethernet/rocker/rocker.c

View file

75

include/linux/netdevice.h

View file

16

net/core/dev.c

View file

2

net/openvswitch/vport-internal_dev.c

View file