diff options
author | David S. Miller <davem@davemloft.net> | 2015-01-19 16:22:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-19 16:22:19 -0500 |
commit | 0c49087462e8587c12ecfeaf1dd46fdc0ddc4532 (patch) | |
tree | b91fa846e41c80cd948c9d8fa636bd352ed98a31 /net/wireless/core.c | |
parent | 926e9878a360fc57112259949c44c74c31709cc6 (diff) | |
parent | c1e140bf79d817d4a7aa9932eb98b0359c87af33 (diff) | |
download | op-kernel-dev-0c49087462e8587c12ecfeaf1dd46fdc0ddc4532.zip op-kernel-dev-0c49087462e8587c12ecfeaf1dd46fdc0ddc4532.tar.gz |
Merge tag 'mac80211-next-for-davem-2015-01-19' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Some further updates for net-next:
* fix network-manager which was broken by the previous changes
* fix delete-station events, which were broken by me making the
genlmsg_end() mistake
* fix a timer left running during suspend in some race conditions
that would cause an annoying (but harmless) warning
* (less important, but in the tree already) remove 80+80 MHz rate
reporting since the spec doesn't distinguish it from 160 MHz;
as the bitrate they're both 160 MHz bandwidth
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r-- | net/wireless/core.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 456e4c3..3af0ecf 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -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: /* |