Commit b2748267 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bridge: use dev->addr_assign_type to see if user change mac 



And remove no longer used br->flags.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c5e8933

net/bridge/br_device.c

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ static int br_set_mac_address(struct net_device *dev, void *p) 
		br_fdb_change_mac_address(br, addr->sa_data);

		br_stp_change_bridge_id(br, addr->sa_data);

	}

	br->flags |= BR_SET_MAC_ADDR;

	spin_unlock_bh(&br->lock);



	return 0;

net/bridge/br_private.h

+0 −3
Original line number Diff line number Diff line
@@ -197,9 +197,6 @@ struct net_bridge 
	bool				nf_call_ip6tables;

	bool				nf_call_arptables;

#endif

	unsigned long			flags;

#define BR_SET_MAC_ADDR		0x00000001



	u16				group_fwd_mask;



	/* STP */

net/bridge/br_stp_if.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br) 
	struct net_bridge_port *p;



	/* user has chosen a value so keep it */

	if (br->flags & BR_SET_MAC_ADDR)

	if (br->dev->addr_assign_type == NET_ADDR_SET)

		return false;



	list_for_each_entry(p, &br->port_list, list) {