mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-10-13 23:11:16 +00:00
143 lines
4.5 KiB
Diff
143 lines
4.5 KiB
Diff
From 3f71c515efc802e6ef4e5a926a343041561b29ca Mon Sep 17 00:00:00 2001
|
|
From: Ido Schimmel <idosch@mellanox.com>
|
|
Date: Mon, 10 Apr 2017 14:59:27 +0300
|
|
Subject: [PATCH 13/14] 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>
|
|
(cherry picked from commit b6fe0440c63716e09cfc0d1484e3898a0f29d1d1)
|
|
---
|
|
net/bridge/br_device.c | 20 +++++++++++---------
|
|
net/bridge/br_if.c | 1 -
|
|
net/bridge/br_multicast.c | 7 +++++--
|
|
net/bridge/br_private.h | 5 +++++
|
|
4 files changed, 21 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
|
|
index 5f5e28f210e0..15be72678bc8 100644
|
|
--- a/net/bridge/br_device.c
|
|
+++ b/net/bridge/br_device.c
|
|
@@ -122,6 +122,15 @@ static int br_dev_init(struct net_device *dev)
|
|
return err;
|
|
}
|
|
|
|
+static void br_dev_uninit(struct net_device *dev)
|
|
+{
|
|
+ struct net_bridge *br = netdev_priv(dev);
|
|
+
|
|
+ br_multicast_uninit_stats(br);
|
|
+ br_vlan_flush(br);
|
|
+ free_percpu(br->stats);
|
|
+}
|
|
+
|
|
static int br_dev_open(struct net_device *dev)
|
|
{
|
|
struct net_bridge *br = netdev_priv(dev);
|
|
@@ -337,6 +346,7 @@ static const struct net_device_ops br_netdev_ops = {
|
|
.ndo_open = br_dev_open,
|
|
.ndo_stop = br_dev_stop,
|
|
.ndo_init = br_dev_init,
|
|
+ .ndo_uninit = br_dev_uninit,
|
|
.ndo_start_xmit = br_dev_xmit,
|
|
.ndo_get_stats64 = br_get_stats64,
|
|
.ndo_set_mac_address = br_set_mac_address,
|
|
@@ -363,14 +373,6 @@ static const struct net_device_ops br_netdev_ops = {
|
|
.ndo_features_check = passthru_features_check,
|
|
};
|
|
|
|
-static void br_dev_free(struct net_device *dev)
|
|
-{
|
|
- struct net_bridge *br = netdev_priv(dev);
|
|
-
|
|
- free_percpu(br->stats);
|
|
- free_netdev(dev);
|
|
-}
|
|
-
|
|
static struct device_type br_type = {
|
|
.name = "bridge",
|
|
};
|
|
@@ -383,7 +385,7 @@ void br_dev_setup(struct net_device *dev)
|
|
ether_setup(dev);
|
|
|
|
dev->netdev_ops = &br_netdev_ops;
|
|
- dev->destructor = br_dev_free;
|
|
+ dev->destructor = free_netdev;
|
|
dev->ethtool_ops = &br_ethtool_ops;
|
|
SET_NETDEV_DEVTYPE(dev, &br_type);
|
|
dev->priv_flags = IFF_EBRIDGE | IFF_NO_QUEUE;
|
|
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
|
|
index 8e173324693d..1764de88483c 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);
|
|
del_timer_sync(&br->gc_timer);
|
|
|
|
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
|
|
index 2136e45f5277..4c16e01031d4 100644
|
|
--- a/net/bridge/br_multicast.c
|
|
+++ b/net/bridge/br_multicast.c
|
|
@@ -1898,8 +1898,6 @@ void br_multicast_dev_del(struct net_bridge *br)
|
|
|
|
out:
|
|
spin_unlock_bh(&br->multicast_lock);
|
|
-
|
|
- free_percpu(br->mcast_stats);
|
|
}
|
|
|
|
int br_multicast_set_router(struct net_bridge *br, unsigned long val)
|
|
@@ -2354,6 +2352,11 @@ int br_multicast_init_stats(struct net_bridge *br)
|
|
return 0;
|
|
}
|
|
|
|
+void br_multicast_uninit_stats(struct net_bridge *br)
|
|
+{
|
|
+ free_percpu(br->mcast_stats);
|
|
+}
|
|
+
|
|
static void mcast_stats_add_dir(u64 *dst, u64 *src)
|
|
{
|
|
dst[BR_MCAST_DIR_RX] += src[BR_MCAST_DIR_RX];
|
|
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
|
|
index 1b63177e0ccd..417edbe7b8b2 100644
|
|
--- a/net/bridge/br_private.h
|
|
+++ b/net/bridge/br_private.h
|
|
@@ -601,6 +601,7 @@ void br_rtr_notify(struct net_device *dev, struct net_bridge_port *port,
|
|
void br_multicast_count(struct net_bridge *br, const struct net_bridge_port *p,
|
|
const struct sk_buff *skb, u8 type, u8 dir);
|
|
int br_multicast_init_stats(struct net_bridge *br);
|
|
+void br_multicast_uninit_stats(struct net_bridge *br);
|
|
void br_multicast_get_stats(const struct net_bridge *br,
|
|
const struct net_bridge_port *p,
|
|
struct br_mcast_stats *dest);
|
|
@@ -741,6 +742,10 @@ static inline int br_multicast_init_stats(struct net_bridge *br)
|
|
return 0;
|
|
}
|
|
|
|
+static inline void br_multicast_uninit_stats(struct net_bridge *br)
|
|
+{
|
|
+}
|
|
+
|
|
static inline int br_multicast_igmp_type(const struct sk_buff *skb)
|
|
{
|
|
return 0;
|
|
--
|
|
2.19.2
|
|
|