diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-26 22:39:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-26 22:39:08 -0400 |
| commit | b1513c35317c106a1588f3ab32f6888f0e2afd71 (patch) | |
| tree | b2cd68a0d34dd04eb89fcf28e173e5ee22f898fd /net/bridge | |
| parent | 78a57b482aa53b040fbc2b2ef0208b54f004161b (diff) | |
| parent | f83246089ca09308425175d47f5e71e6da68b2ef (diff) | |
| download | linux-b1513c35317c106a1588f3ab32f6888f0e2afd71.tar.gz linux-b1513c35317c106a1588f3ab32f6888f0e2afd71.tar.bz2 linux-b1513c35317c106a1588f3ab32f6888f0e2afd71.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_device.c | 1 | ||||
| -rw-r--r-- | net/bridge/br_if.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 90f49a194249..430b53e7d941 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -123,6 +123,7 @@ static void br_dev_uninit(struct net_device *dev) { struct net_bridge *br = netdev_priv(dev); + br_multicast_dev_del(br); br_multicast_uninit_stats(br); br_vlan_flush(br); free_percpu(br->stats); diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 6d273ca0bf7c..f3544d96155c 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -312,7 +312,6 @@ void br_dev_delete(struct net_device *dev, struct list_head *head) br_fdb_delete_by_port(br, NULL, 0, 1); - br_multicast_dev_del(br); cancel_delayed_work_sync(&br->gc_work); br_sysfs_delbr(br->dev); |