bridge: allow ext learned entries to change ports
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Mon, 3 Jul 2017 22:14:59 +0000 (15:14 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Jul 2017 08:49:44 +0000 (01:49 -0700)
current code silently ignores change of port in the request
message. This patch makes sure the port is modified and
notification is sent to userspace.

Fixes: cf6b8e1eedff ("bridge: add API to notify bridge driver of learned FBD on offloaded device")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_fdb.c

index fef7872a320b4a0097009d25f2bd91e3f69d41dd..a5e4a736a9840420baa91c429bb0e29ff4d0f904 100644 (file)
@@ -1079,8 +1079,9 @@ void br_fdb_unsync_static(struct net_bridge *br, struct net_bridge_port *p)
 int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
                              const unsigned char *addr, u16 vid)
 {
-       struct hlist_head *head;
        struct net_bridge_fdb_entry *fdb;
+       struct hlist_head *head;
+       bool modified = false;
        int err = 0;
 
        spin_lock_bh(&br->hash_lock);
@@ -1095,14 +1096,25 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p,
                }
                fdb->added_by_external_learn = 1;
                fdb_notify(br, fdb, RTM_NEWNEIGH);
-       } else if (fdb->added_by_external_learn) {
-               /* Refresh entry */
-               fdb->updated = fdb->used = jiffies;
-       } else if (!fdb->added_by_user) {
-               /* Take over SW learned entry */
-               fdb->added_by_external_learn = 1;
+       } else {
                fdb->updated = jiffies;
-               fdb_notify(br, fdb, RTM_NEWNEIGH);
+
+               if (fdb->dst != p) {
+                       fdb->dst = p;
+                       modified = true;
+               }
+
+               if (fdb->added_by_external_learn) {
+                       /* Refresh entry */
+                       fdb->used = jiffies;
+               } else if (!fdb->added_by_user) {
+                       /* Take over SW learned entry */
+                       fdb->added_by_external_learn = 1;
+                       modified = true;
+               }
+
+               if (modified)
+                       fdb_notify(br, fdb, RTM_NEWNEIGH);
        }
 
 err_unlock: