aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-01-19 12:49:50 -0500
committerJohannes Berg <johannes.berg@intel.com>2015-01-19 12:49:56 -0500
commit6e9f3fa4f0401ad3a8fe4e5b1282d35539b58a0f (patch)
treec83cc07089cc13afea911d18a53832ddf33be743 /net/wireless
parent57007121228347515187049a9c65f7cbeb923dd1 (diff)
Revert "wireless: Support of IFLA_INFO_KIND rtnl attribute"
This reverts commit ba1debdfed974f25aa598c283567878657b292ee. Oliver reported that it breaks network-manager, for some reason with this patch NM decides that the device isn't wireless but "generic" (ethernet), sees no carrier (as expected with wifi) and fails to do anything else with it. Revert this to unbreak userspace. Reported-by: Oliver Hartkopp <socketcan@hartkopp.net> Tested-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/core.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 456e4c38c279..3af0ecf1cc16 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -21,7 +21,6 @@
21#include <linux/sched.h> 21#include <linux/sched.h>
22#include <net/genetlink.h> 22#include <net/genetlink.h>
23#include <net/cfg80211.h> 23#include <net/cfg80211.h>
24#include <net/rtnetlink.h>
25#include "nl80211.h" 24#include "nl80211.h"
26#include "core.h" 25#include "core.h"
27#include "sysfs.h" 26#include "sysfs.h"
@@ -964,10 +963,6 @@ void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev,
964} 963}
965EXPORT_SYMBOL(cfg80211_stop_iface); 964EXPORT_SYMBOL(cfg80211_stop_iface);
966 965
967static const struct rtnl_link_ops wireless_link_ops = {
968 .kind = "wlan",
969};
970
971static int cfg80211_netdev_notifier_call(struct notifier_block *nb, 966static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
972 unsigned long state, void *ptr) 967 unsigned long state, void *ptr)
973{ 968{
@@ -986,7 +981,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
986 switch (state) { 981 switch (state) {
987 case NETDEV_POST_INIT: 982 case NETDEV_POST_INIT:
988 SET_NETDEV_DEVTYPE(dev, &wiphy_type); 983 SET_NETDEV_DEVTYPE(dev, &wiphy_type);
989 dev->rtnl_link_ops = &wireless_link_ops;
990 break; 984 break;
991 case NETDEV_REGISTER: 985 case NETDEV_REGISTER:
992 /* 986 /*