From 2caf374c6bd84a3747ee9c899c89d120407abfd4 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Sun, 10 Feb 2013 11:41:01 +0000 Subject: [PATCH] --- yaml --- r: 352403 b: refs/heads/master c: b2748267d6487857f1400dc42748c5409e0ee130 h: refs/heads/master i: 352401: 5e88e8959926c2e16e09ad1e8bb428207a59d03c 352399: f70378820503745ee16997248210782dd129e3a7 v: v3 --- [refs] | 2 +- trunk/net/bridge/br_device.c | 1 - trunk/net/bridge/br_private.h | 3 --- trunk/net/bridge/br_stp_if.c | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c0a946914b9a..c1514cfc7a0b 100644 --- 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 index e1bc090bc00a..ba6fb2d60940 100644 --- 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 index 711094aed41a..06e85d9c05aa 100644 --- 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 index 7b5197c7de13..0bdb4ebd362b 100644 --- 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) {