From 68528bfe6ec438b35b184095ba94a90b7c2aad46 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 19 Jan 2015 18:49:50 +0100 Subject: [PATCH] Revert "wireless: Support of IFLA_INFO_KIND rtnl attribute" This reverts commit fddb19b536bbcbc48d5e3170517e5b33244e039e. 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 Tested-by: Oliver Hartkopp Signed-off-by: Johannes Berg --- net/wireless/core.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/wireless/core.c b/net/wireless/core.c index 456e4c38c2797..3af0ecf1cc168 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -21,7 +21,6 @@ #include #include #include -#include #include "nl80211.h" #include "core.h" #include "sysfs.h" @@ -964,10 +963,6 @@ void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev, } EXPORT_SYMBOL(cfg80211_stop_iface); -static const struct rtnl_link_ops wireless_link_ops = { - .kind = "wlan", -}; - static int cfg80211_netdev_notifier_call(struct notifier_block *nb, unsigned long state, void *ptr) { @@ -986,7 +981,6 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb, switch (state) { case NETDEV_POST_INIT: SET_NETDEV_DEVTYPE(dev, &wiphy_type); - dev->rtnl_link_ops = &wireless_link_ops; break; case NETDEV_REGISTER: /* -- 2.39.5