summaryrefslogtreecommitdiffstats
path: root/net/mac80211/pm.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-14 14:34:25 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-01-03 13:01:37 +0100
commitad2d223aa900179031feb40273881e212941573d (patch)
tree2d9a697ae91adb3460aabf32901e7108bdc8523f /net/mac80211/pm.c
parentb8dc1a35c88dddcf62ce7bc59a7ed4c38c2f7597 (diff)
downloadop-kernel-dev-ad2d223aa900179031feb40273881e212941573d.zip
op-kernel-dev-ad2d223aa900179031feb40273881e212941573d.tar.gz
mac80211: assign bss_conf.bssid only once
Instead of checking every time bss_info_changed is called, assign the pointer once depending on the interface type and then leave it untouched until the interface type is changed. This makes the ieee80211_bss_info_change_notify() now a simple wrapper to call the driver only. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/pm.c')
-rw-r--r--net/mac80211/pm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
index 8a67d7e..f81fd30 100644
--- a/net/mac80211/pm.c
+++ b/net/mac80211/pm.c
@@ -121,6 +121,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
/* remove all interfaces */
list_for_each_entry(sdata, &local->interfaces, list) {
+ static u8 zero_addr[ETH_ALEN] = {};
u32 changed = 0;
if (!ieee80211_sdata_running(sdata))
@@ -152,6 +153,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
sdata->suspend_bss_conf = sdata->vif.bss_conf;
memset(&sdata->vif.bss_conf, 0, sizeof(sdata->vif.bss_conf));
sdata->vif.bss_conf.idle = true;
+ if (sdata->suspend_bss_conf.bssid)
+ sdata->vif.bss_conf.bssid = zero_addr;
/* disable beaconing or remove association */
ieee80211_bss_info_change_notify(sdata, changed);
OpenPOWER on IntegriCloud