[MAC80211]: print out wiphy name instead of master device

[mirror_ubuntu-zesty-kernel.git] / net / mac80211 / ieee80211_cfg.c

diff --git a/net/mac80211/ieee80211_cfg.c b/net/mac80211/ieee80211_cfg.c
index 509096edb32463f7cae3720c93ad5e39b0c3a0fb..d6fc55cc8ad4778d1c55681d5d4f8440eb46fc90 100644 (file)
--- a/net/mac80211/ieee80211_cfg.c
+++ b/net/mac80211/ieee80211_cfg.c
@@ -8,12 +8,13 @@
 
 #include <linux/nl80211.h>
 #include <linux/rtnetlink.h>
+#include <net/net_namespace.h>
 #include <net/cfg80211.h>
 #include "ieee80211_i.h"
 #include "ieee80211_cfg.h"
 
 static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
-                              unsigned int type)
+                              enum nl80211_iftype type)
 {
        struct ieee80211_local *local = wiphy_priv(wiphy);
        int itype;
@@ -50,7 +51,7 @@ static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)
        if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
                return -ENODEV;
 
-       dev = dev_get_by_index(ifindex);
+       dev = dev_get_by_index(&init_net, ifindex);
        if (!dev)
                return 0;