diff options
author | Ido Schimmel <idosch@mellanox.com> | 2017-04-10 14:59:27 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-04-11 22:22:44 -0400 |
commit | b6fe0440c63716e09cfc0d1484e3898a0f29d1d1 (patch) | |
tree | 60ea2b07bf9c997f66f6a3931676c4664ca1ea99 /net/bridge/br_if.c | |
parent | 96a94cc5158859943b7e4e72ae69e572815f5413 (diff) | |
download | linux-b6fe0440c63716e09cfc0d1484e3898a0f29d1d1.tar.bz2 |
bridge: implement missing ndo_uninit()
While the bridge driver implements an ndo_init(), it was missing a
symmetric ndo_uninit(), causing the different de-initialization
operations to be scattered around its dellink() and destructor().
Implement a symmetric ndo_uninit() and remove the overlapping operations
from its dellink() and destructor().
This is a prerequisite for the next patch, as it allows us to have a
proper cleanup upon changelink() failure during the bridge's newlink().
Fixes: b6677449dff6 ("bridge: netlink: call br_changelink() during br_dev_newlink()")
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_if.c')
-rw-r--r-- | net/bridge/br_if.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 8ac1770aa222..56a2a72e7738 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -311,7 +311,6 @@ void br_dev_delete(struct net_device *dev, struct list_head *head) br_fdb_delete_by_port(br, NULL, 0, 1); - br_vlan_flush(br); br_multicast_dev_del(br); cancel_delayed_work_sync(&br->gc_work); |