diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-12-14 08:34:25 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-03 07:01:37 -0500 |
commit | ad2d223aa900179031feb40273881e212941573d (patch) | |
tree | 2d9a697ae91adb3460aabf32901e7108bdc8523f /net/mac80211/pm.c | |
parent | b8dc1a35c88dddcf62ce7bc59a7ed4c38c2f7597 (diff) |
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.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c index 8a67d7e982f7..f81fd30581d9 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) | |||
121 | 121 | ||
122 | /* remove all interfaces */ | 122 | /* remove all interfaces */ |
123 | list_for_each_entry(sdata, &local->interfaces, list) { | 123 | list_for_each_entry(sdata, &local->interfaces, list) { |
124 | static u8 zero_addr[ETH_ALEN] = {}; | ||
124 | u32 changed = 0; | 125 | u32 changed = 0; |
125 | 126 | ||
126 | if (!ieee80211_sdata_running(sdata)) | 127 | if (!ieee80211_sdata_running(sdata)) |
@@ -152,6 +153,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) | |||
152 | sdata->suspend_bss_conf = sdata->vif.bss_conf; | 153 | sdata->suspend_bss_conf = sdata->vif.bss_conf; |
153 | memset(&sdata->vif.bss_conf, 0, sizeof(sdata->vif.bss_conf)); | 154 | memset(&sdata->vif.bss_conf, 0, sizeof(sdata->vif.bss_conf)); |
154 | sdata->vif.bss_conf.idle = true; | 155 | sdata->vif.bss_conf.idle = true; |
156 | if (sdata->suspend_bss_conf.bssid) | ||
157 | sdata->vif.bss_conf.bssid = zero_addr; | ||
155 | 158 | ||
156 | /* disable beaconing or remove association */ | 159 | /* disable beaconing or remove association */ |
157 | ieee80211_bss_info_change_notify(sdata, changed); | 160 | ieee80211_bss_info_change_notify(sdata, changed); |