net: bridge: fdb: convert added_by_external_learn to use bitops

Convert the added_by_external_learn field to a flag and use bitops.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 6f00cca4afc8635f6d9b4faa7145f6863fe23fee..83d6be3f87f1e5b2b094fb802bfe03bdc6544a4a 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -76,7 +76,7 @@ static inline int has_expired(const struct net_bridge *br,
                                  const struct net_bridge_fdb_entry *fdb)
 {
        return !test_bit(BR_FDB_STATIC, &fdb->flags) &&
-              !fdb->added_by_external_learn &&
+              !test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags) &&
               time_before_eq(fdb->updated + hold_time(br), jiffies);
 }
 
@@ -352,7 +352,7 @@ void br_fdb_cleanup(struct work_struct *work)
                unsigned long this_timer;
 
                if (test_bit(BR_FDB_STATIC, &f->flags) ||
-                   f->added_by_external_learn)
+                   test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &f->flags))
                        continue;
                this_timer = f->updated + delay;
                if (time_after(this_timer, now)) {
@@ -506,7 +506,6 @@ static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br,
                        set_bit(BR_FDB_LOCAL, &fdb->flags);
                if (is_static)
                        set_bit(BR_FDB_STATIC, &fdb->flags);
-               fdb->added_by_external_learn = 0;
                fdb->offloaded = 0;
                fdb->updated = fdb->used = jiffies;
                if (rhashtable_lookup_insert_fast(&br->fdb_hash_tbl,
@@ -593,8 +592,8 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                                fdb->dst = source;
                                fdb_modified = true;
                                /* Take over HW learned entry */
-                               if (unlikely(fdb->added_by_external_learn))
-                                       fdb->added_by_external_learn = 0;
+                               test_and_clear_bit(BR_FDB_ADDED_BY_EXT_LEARN,
+                                                  &fdb->flags);
                        }
                        if (now != fdb->updated)
                                fdb->updated = now;
@@ -659,7 +658,7 @@ static int fdb_fill_info(struct sk_buff *skb, const struct net_bridge *br,
 
        if (fdb->offloaded)
                ndm->ndm_flags |= NTF_OFFLOADED;
-       if (fdb->added_by_external_learn)
+       if (test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags))
                ndm->ndm_flags |= NTF_EXT_LEARNED;
        if (test_bit(BR_FDB_STICKY, &fdb->flags))
                ndm->ndm_flags |= NTF_STICKY;
@@ -1129,7 +1128,7 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
                }
                if (swdev_notify)
                        set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
-               fdb->added_by_external_learn = 1;
+               set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags);
                fdb_notify(br, fdb, RTM_NEWNEIGH, swdev_notify);
        } else {
                fdb->updated = jiffies;
@@ -1139,12 +1138,12 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
                        modified = true;
                }
 
-               if (fdb->added_by_external_learn) {
+               if (test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags)) {
                        /* Refresh entry */
                        fdb->used = jiffies;
                } else if (!test_bit(BR_FDB_ADDED_BY_USER, &fdb->flags)) {
                        /* Take over SW learned entry */
-                       fdb->added_by_external_learn = 1;
+                       set_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags);
                        modified = true;
                }
 
@@ -1171,7 +1170,7 @@ int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,
        spin_lock_bh(&br->hash_lock);
 
        fdb = br_fdb_find(br, addr, vid);
-       if (fdb && fdb->added_by_external_learn)
+       if (fdb && test_bit(BR_FDB_ADDED_BY_EXT_LEARN, &fdb->flags))
                fdb_delete(br, fdb, swdev_notify);
        else
                err = -ENOENT;

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index bf4a4d1cc3bba6d61bea9b435f23134aedf3ecc9..cf325177a34e5506fdf4689168c7cd3e8a8f58ec 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -178,6 +178,7 @@ enum {
        BR_FDB_STATIC,
        BR_FDB_STICKY,
        BR_FDB_ADDED_BY_USER,
+       BR_FDB_ADDED_BY_EXT_LEARN,
 };
 
 struct net_bridge_fdb_key {
@@ -192,8 +193,7 @@ struct net_bridge_fdb_entry {
        struct net_bridge_fdb_key       key;
        struct hlist_node               fdb_node;
        unsigned long                   flags;
-       unsigned char                   added_by_external_learn:1,
-                                       offloaded:1;
+       unsigned char                   offloaded:1;
 
        /* write-heavy members should not affect lookups */
        unsigned long                   updated ____cacheline_aligned_in_smp;