---

yaml --- r: 352403 b: refs/heads/master c: b274826 h: refs/heads/master i: 352401: 5e88e89 352399: f703788 v: v3
git-mirror · Feb 11, 2013 · 2caf374 · 2caf374
1 parent 3efa036
commit 2caf374
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c5e89338493882719f8d138f8f2717ee9a04153
+refs/heads/master: b2748267d6487857f1400dc42748c5409e0ee130
diff --git a/trunk/net/bridge/br_device.c b/trunk/net/bridge/br_device.c
@@ -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;

diff --git a/trunk/net/bridge/br_private.h b/trunk/net/bridge/br_private.h
@@ -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 */

diff --git a/trunk/net/bridge/br_stp_if.c b/trunk/net/bridge/br_stp_if.c
@@ -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) {