提交 b2748267 编写于 作者: J Jiri Pirko 提交者: David S. Miller

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

And remove no longer used br->flags.
Signed-off-by: NJiri Pirko <jiri@resnulli.us>
Acked-by: NStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 2c5e8933
......@@ -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;
......
......@@ -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 */
......
......@@ -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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册