aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/main.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-12-14 08:22:10 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-01-03 07:01:36 -0500
commitb8dc1a35c88dddcf62ce7bc59a7ed4c38c2f7597 (patch)
tree557b5f33c852896f353349c2d25ddba146848066 /net/mac80211/main.c
parent8da349329ae52462253052f804ef30d086c9911a (diff)
mac80211: further simplify ieee80211_bss_info_change_notify
The special case in the function isn't really needed, instead make the suspend code a bit better and also easier to understand and move the warning into the driver op wrapper inline. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r--net/mac80211/main.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 71a64f49fe61..b719a16eabde 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -231,20 +231,6 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
231 return; 231 return;
232 } 232 }
233 233
234 switch (sdata->vif.type) {
235 case NL80211_IFTYPE_AP:
236 case NL80211_IFTYPE_ADHOC:
237 case NL80211_IFTYPE_WDS:
238 case NL80211_IFTYPE_MESH_POINT:
239 break;
240 default:
241 /* do not warn to simplify caller in scan.c */
242 changed &= ~BSS_CHANGED_BEACON_ENABLED;
243 if (WARN_ON(changed & BSS_CHANGED_BEACON))
244 return;
245 break;
246 }
247
248 drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed); 234 drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed);
249} 235}
250 236