[PATCH 3/9] d80211: better deallocation of mdev
From: Jiri Benc <hidden>
Date: 2006-07-18 15:43:36
Subsystem:
networking [general], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Master device and ieee80211_local are allocated separately now, so master device can be freed by the same function as other virtual interfaces. Signed-off-by: Jiri Benc <redacted> --- net/d80211/ieee80211.c | 2 +- net/d80211/ieee80211_iface.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 603ee5045dad050a66b94a847cd5385fc7678ce9
diff --git a/net/d80211/ieee80211.c b/net/d80211/ieee80211.c
index 549c8a4..3d7091a 100644
--- a/net/d80211/ieee80211.c
+++ b/net/d80211/ieee80211.c@@ -4534,7 +4534,7 @@ void ieee80211_free_hw(struct net_device { struct ieee80211_local *local = dev->ieee80211_ptr; - free_netdev(dev); + ieee80211_if_free(dev); ieee80211_dev_free(local); }
diff --git a/net/d80211/ieee80211_iface.c b/net/d80211/ieee80211_iface.c
index 5abd713..566bb36 100644
--- a/net/d80211/ieee80211_iface.c
+++ b/net/d80211/ieee80211_iface.c@@ -337,7 +337,8 @@ void ieee80211_if_free(struct net_device { struct ieee80211_local *local = dev->ieee80211_ptr; - BUG_ON(dev == local->mdev || dev == local->apdev); + /* local->apdev must be NULL when freeing management interface */ + BUG_ON(dev == local->apdev); free_netdev(dev); }
--
1.3.0