bridge: change arguments to fdb_create

Later patch provides ability to create non-local static entry.
To make this easier move the updating of the flag values to
after the code that creates entry.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.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 88485cc74dc31c697d33ddc5eb2c5f2a0d3d0dee..70bd0bf04099bcbe8a5bb197f76bc8f8c26ad136 100644 (file)
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -320,8 +320,7 @@ static inline struct net_bridge_fdb_entry *fdb_find(struct hlist_head *head,
 
 static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head,
                                               struct net_bridge_port *source,
-                                              const unsigned char *addr,
-                                              int is_local)
+                                              const unsigned char *addr)
 {
        struct net_bridge_fdb_entry *fdb;
 
@@ -329,10 +328,9 @@ static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head,
        if (fdb) {
                memcpy(fdb->addr.addr, addr, ETH_ALEN);
                fdb->dst = source;
-               fdb->is_local = is_local;
-               fdb->is_static = is_local;
+               fdb->is_local = 0;
+               fdb->is_static = 0;
                fdb->ageing_timer = jiffies;
-
                hlist_add_head_rcu(&fdb->hlist, head);
        }
        return fdb;
@@ -360,12 +358,15 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
                fdb_delete(fdb);
        }
 
-       if (!fdb_create(head, source, addr, 1))
+       fdb = fdb_create(head, source, addr);
+       if (!fdb)
                return -ENOMEM;
 
+       fdb->is_local = fdb->is_static = 1;
        return 0;
 }
 
+/* Add entry for local address of interface */
 int br_fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
                  const unsigned char *addr)
 {
@@ -407,8 +408,9 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
                }
        } else {
                spin_lock(&br->hash_lock);
-               if (!fdb_find(head, addr))
-                       fdb_create(head, source, addr, 0);
+               if (likely(!fdb_find(head, addr)))
+                       fdb_create(head, source, addr);
+
                /* else  we lose race and someone else inserts
                 * it first, don't bother updating
                 */