Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e9f3fa4 authored by Johannes Berg's avatar Johannes Berg
Browse files

Revert "wireless: Support of IFLA_INFO_KIND rtnl attribute" 



This reverts commit ba1debdf.

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: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Tested-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 57007121

net/wireless/core.c

+0 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/sched.h>

#include <net/genetlink.h>

#include <net/cfg80211.h>

#include <net/rtnetlink.h>

#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:

		/*