Skip to content

Commit

Permalink
Revert "wireless: Support of IFLA_INFO_KIND rtnl attribute"
Browse files Browse the repository at this point in the history
This reverts commit ba1debd.

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>
  • Loading branch information
Johannes Berg committed Jan 19, 2015
1 parent 5700712 commit 6e9f3fa
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions net/wireless/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
{
Expand All @@ -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:
/*
Expand Down

0 comments on commit 6e9f3fa

Please sign in to comment.