diff options
author | Jiri Pirko <jiri@resnulli.us> | 2013-02-10 06:41:01 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-11 14:16:26 -0500 |
commit | b2748267d6487857f1400dc42748c5409e0ee130 (patch) | |
tree | 76b5c6ec2d734607d3bbc01d87348d44ce5c84df /net/bridge/br_private.h | |
parent | 2c5e89338493882719f8d138f8f2717ee9a04153 (diff) |
bridge: use dev->addr_assign_type to see if user change mac
And remove no longer used br->flags.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r-- | net/bridge/br_private.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 711094aed41a..06e85d9c05aa 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -197,9 +197,6 @@ struct net_bridge | |||
197 | bool nf_call_ip6tables; | 197 | bool nf_call_ip6tables; |
198 | bool nf_call_arptables; | 198 | bool nf_call_arptables; |
199 | #endif | 199 | #endif |
200 | unsigned long flags; | ||
201 | #define BR_SET_MAC_ADDR 0x00000001 | ||
202 | |||
203 | u16 group_fwd_mask; | 200 | u16 group_fwd_mask; |
204 | 201 | ||
205 | /* STP */ | 202 | /* STP */ |