diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-07-12 19:28:31 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-13 16:16:10 +0200 |
| commit | 075e08477d51709ae1998a05c35aadf59ef823b9 (patch) | |
| tree | ed1d72cfa15a711901484e82cd56577f60d9dd8e /net/mac80211/cfg.c | |
| parent | 4b4b8229aeff4ca09b4aee921d383c596146eca0 (diff) | |
| download | blackbird-op-linux-075e08477d51709ae1998a05c35aadf59ef823b9.tar.gz blackbird-op-linux-075e08477d51709ae1998a05c35aadf59ef823b9.zip | |
Revert "mac80211: refactor virtual monitor code"
This reverts commit 870d37fc22f3e40f9f23e06c581c8538fc16a2f0.
This code doesn't work as cfg80211 will call
set_monitor_enabled at the wrong time and it
doesn't seem to be possible to fix this.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index cfdc03f59e27..e95f24eef870 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -2982,16 +2982,6 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev, return 0; } -static void ieee80211_set_monitor_enabled(struct wiphy *wiphy, bool enabled) -{ - struct ieee80211_local *local = wiphy_priv(wiphy); - - if (enabled) - WARN_ON(ieee80211_add_virtual_monitor(local)); - else - ieee80211_del_virtual_monitor(local); -} - #ifdef CONFIG_PM static void ieee80211_set_wakeup(struct wiphy *wiphy, bool enabled) { @@ -3066,7 +3056,6 @@ struct cfg80211_ops mac80211_config_ops = { .tdls_mgmt = ieee80211_tdls_mgmt, .probe_client = ieee80211_probe_client, .set_noack_map = ieee80211_set_noack_map, - .set_monitor_enabled = ieee80211_set_monitor_enabled, #ifdef CONFIG_PM .set_wakeup = ieee80211_set_wakeup, #endif |
