replace net_device arguments with ieee80211_{local,sub_if_data} as appropriate

[deliverable/linux.git] / net / mac80211 / iface.c

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 610ed1d9893af95b3fda10005f3d6d535c3603ad..4a623b8e91fd532f4f5c5a44ce070ede32776219 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -56,7 +56,7 @@ static void ieee80211_teardown_sdata(struct net_device *dev)
        case IEEE80211_IF_TYPE_MESH_POINT:
                /* Allow compiler to elide mesh_rmc_free call. */
                if (ieee80211_vif_is_mesh(&sdata->vif))
-                       mesh_rmc_free(dev);
+                       mesh_rmc_free(sdata);
                /* fall through */
        case IEEE80211_IF_TYPE_STA:
        case IEEE80211_IF_TYPE_IBSS:
@@ -241,15 +241,13 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name,
        return ret;
 }
 
-void ieee80211_if_remove(struct net_device *dev)
+void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata)
 {
-       struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
-
        ASSERT_RTNL();
 
        list_del_rcu(&sdata->list);
        synchronize_rcu();
-       unregister_netdevice(dev);
+       unregister_netdevice(sdata->dev);
 }
 
 /*