summaryrefslogtreecommitdiffstats
path: root/net/mac80211/pm.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-01-20 13:55:22 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-02-06 20:48:25 +0100
commita4ec45a421b80bc36fd37578accf081f32527a7f (patch)
tree2eed7b4fbdece2358be059773b010b6acc3806b0 /net/mac80211/pm.c
parentmac80211: add sta_state callback (diff)
downloadlinux-a4ec45a421b80bc36fd37578accf081f32527a7f.tar.xz
linux-a4ec45a421b80bc36fd37578accf081f32527a7f.zip
mac80211: implement sta_add/sta_remove in sta_state
Instead of maintaining separate sta_add/sta_remove callsites, implement it in sta_state when the driver has no sta_state implementation. The only behavioural change this should cause is in secure mesh mode: with this the station entries will only be created after the stations are set to AUTH. Given which drivers support mesh, this seems to not be a problem. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/pm.c')
-rw-r--r--net/mac80211/pm.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index af49ac4f0826..2b53a5348ace 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -100,8 +100,6 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
if (sta->uploaded) {
enum ieee80211_sta_state state;
- drv_sta_remove(local, sta->sdata, &sta->sta);
-
state = sta->sta_state;
for (; state > IEEE80211_STA_NOTEXIST; state--)
WARN_ON(drv_sta_state(local, sdata, sta,