net: bridge: fdb: set flags directly in fdb_create

No need to have separate arguments for each flag, just set the flags to
whatever was passed to fdb_create() before the fdb is published.

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 d4f6b398303daa89465875781180765306b8d007..f244f2ac71566174a42023c74ff864565a01f375 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -491,8 +491,7 @@ static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br,
                                               struct net_bridge_port *source,
                                               const unsigned char *addr,
                                               __u16 vid,
-                                              unsigned char is_local,
-                                              unsigned char is_static)
+                                              unsigned long flags)
 {
        struct net_bridge_fdb_entry *fdb;
 
@@ -501,11 +500,7 @@ static struct net_bridge_fdb_entry *fdb_create(struct net_bridge *br,
                memcpy(fdb->key.addr.addr, addr, ETH_ALEN);
                fdb->dst = source;
                fdb->key.vlan_id = vid;
-               fdb->flags = 0;
-               if (is_local)
-                       set_bit(BR_FDB_LOCAL, &fdb->flags);
-               if (is_static)
-                       set_bit(BR_FDB_STATIC, &fdb->flags);
+               fdb->flags = flags;
                fdb->updated = fdb->used = jiffies;
                if (rhashtable_lookup_insert_fast(&br->fdb_hash_tbl,
                                                  &fdb->rhnode,
@@ -539,7 +534,8 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
                fdb_delete(br, fdb, true);
        }
 
-       fdb = fdb_create(br, source, addr, vid, 1, 1);
+       fdb = fdb_create(br, source, addr, vid,
+                        BIT(BR_FDB_LOCAL) | BIT(BR_FDB_STATIC));
        if (!fdb)
                return -ENOMEM;
 
@@ -605,7 +601,7 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                }
        } else {
                spin_lock(&br->hash_lock);
-               fdb = fdb_create(br, source, addr, vid, 0, 0);
+               fdb = fdb_create(br, source, addr, vid, 0);
                if (fdb) {
                        if (unlikely(added_by_user))
                                set_bit(BR_FDB_ADDED_BY_USER, &fdb->flags);
@@ -830,7 +826,7 @@ static int fdb_add_entry(struct net_bridge *br, struct net_bridge_port *source,
                if (!(flags & NLM_F_CREATE))
                        return -ENOENT;
 
-               fdb = fdb_create(br, source, addr, vid, 0, 0);
+               fdb = fdb_create(br, source, addr, vid, 0);
                if (!fdb)
                        return -ENOMEM;
 
@@ -1120,7 +1116,7 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
 
        fdb = br_fdb_find(br, addr, vid);
        if (!fdb) {
-               fdb = fdb_create(br, p, addr, vid, 0, 0);
+               fdb = fdb_create(br, p, addr, vid, 0);
                if (!fdb) {
                        err = -ENOMEM;
                        goto err_unlock;