Commit 9be6dd65 authored by Andrei Warkentin's avatar Andrei Warkentin Committed by David S. Miller
Browse files

Bridge: Always send NETDEV_CHANGEADDR up on br MAC change. 



This ensures the neighbor entries associated with the bridge
dev are flushed, also invalidating the associated cached L2 headers.

This means we br_add_if/br_del_if ports to implement hand-over and
not wind up with bridge packets going out with stale MAC.

This means we can also change MAC of port device and also not wind
up with bridge packets going out with stale MAC.

This builds on Stephen Hemminger's patch, also handling the br_del_if
case and the port MAC change case.

Cc: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarAndrei Warkentin <andreiw@motorola.com>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8028837d

net/bridge/br_if.c

+5 −1
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ put_back: 
int br_del_if(struct net_bridge *br, struct net_device *dev)

{

	struct net_bridge_port *p;

	bool changed_addr;



	p = br_port_get_rtnl(dev);

	if (!p || p->br != br)
@@ -425,9 +426,12 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) 
	del_nbp(p);



	spin_lock_bh(&br->lock);

	br_stp_recalculate_bridge_id(br);

	changed_addr = br_stp_recalculate_bridge_id(br);

	spin_unlock_bh(&br->lock);



	if (changed_addr)

		call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);



	netdev_update_features(br->dev);



	return 0;

net/bridge/br_notify.c

+6 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v 
	struct net_device *dev = ptr;

	struct net_bridge_port *p;

	struct net_bridge *br;

	bool changed_addr;

	int err;



	/* register of bridge completed, add sysfs entries */
@@ -57,8 +58,12 @@ static int br_device_event(struct notifier_block *unused, unsigned long event, v 
	case NETDEV_CHANGEADDR:

		spin_lock_bh(&br->lock);

		br_fdb_changeaddr(p, dev->dev_addr);

		br_stp_recalculate_bridge_id(br);

		changed_addr = br_stp_recalculate_bridge_id(br);

		spin_unlock_bh(&br->lock);



		if (changed_addr)

			call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev);



		break;



	case NETDEV_CHANGE:

CRA Git | Maintained and supported by SUSTech CRA and CCSE