Use BR_PROMISC_BIT and set_bit(), clear_bit() and test_bit() lockless
functions.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
---
  net/bridge/br_if.c      | 4 ++--
  net/bridge/br_private.h | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index d39571e13744431f5e4c67f34ee7de34eb8bb6b0..3169fab686a534cf2a6458ff228eee2b6fc7e7e4 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c

@@ -110,7 +110,7 @@ static void br_port_set_promisc(struct net_bridge_port *p)
  		return;
  
  	br_fdb_unsync_static(p->br, p);
-	p->flags |= BR_PROMISC;
+	set_bit(BR_PROMISC_BIT, &p->flags);
  }
  
  static void br_port_clear_promisc(struct net_bridge_port *p)

@@ -133,7 +133,7 @@ static void br_port_clear_promisc(struct net_bridge_port *p)
  		return;
  
  	dev_set_promiscuity(p->dev, -1);
-	p->flags &= ~BR_PROMISC;
+	clear_bit(BR_PROMISC_BIT, &p->flags);
  }
  
  /* When a port is added or removed or when certain port flags

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 02671e648dac7ab6fd59b80e044f62b00a8e4a8a..d55ea9516e3e369bb9e0045fca5b8d034ef5a45f 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h

@@ -452,7 +452,7 @@ struct net_bridge_port {
  #define kobj_to_brport(obj)	container_of(obj, struct net_bridge_port, kobj)
  
  #define br_auto_port(p) ((p)->flags & BR_AUTO_MASK)
-#define br_promisc_port(p) ((p)->flags & BR_PROMISC)
+#define br_promisc_port(p) test_bit(BR_PROMISC_BIT, &(p)->flags)
  
  static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)
  {