Merge tag 'v3.10.98' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 4cdba60926ffc91c52c031793eb562fb38a84a4a..32bd1e87f149e97a9193eb8a1102d5e608b1b0a3 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -172,6 +172,8 @@ void br_dev_delete(struct net_device *dev, struct list_head *head)
                del_nbp(p);
        }
 
+       br_fdb_delete_by_port(br, NULL, 1);
+
        del_timer_sync(&br->gc_timer);
 
        br_sysfs_delbr(br->dev);