Merge branch 'tipc-next'

Browse source

Erik Hugne says:

====================
tipc: fix handling of NETDEV_CHANGEADDR event

Aside from manual reconfiguration of the netdevice hwaddr, this can also
be changed automatically for an interface bond in active-backup mode
if fail_over_mac is enabled. This patchset fixes the handling of this
event in TIPC by properly updating the l2 media address for the bearer,
followed by a reinitialization of the node discovery mechanism.
====================

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

...

This commit is contained in:

David S. Miller 2014-03-28 14:46:34 -04:00

parent c8c3d7e244 16470111ed

commit f3c9ec05ab

4 changed files with 18 additions and 15 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

9

net/tipc/bearer.c

View file

2

net/tipc/bearer.h

View file

19

net/tipc/discover.c

View file

3

net/tipc/discover.h

View file