summaryrefslogtreecommitdiffstats
path: root/net/mac80211/driver-ops.h
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/driver-ops.h
parentb8dc1a35c88dddcf62ce7bc59a7ed4c38c2f7597 (diff)
downloadblackbird-op-linux-ad2d223aa900179031feb40273881e212941573d.tar.gz
blackbird-op-linux-ad2d223aa900179031feb40273881e212941573d.zip
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/driver-ops.h')
-rw-r--r--net/mac80211/driver-ops.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index cccc486ae3d0..0c07f94c5378 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -212,6 +212,8 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local,
sdata->vif.type != NL80211_IFTYPE_AP &&
sdata->vif.type != NL80211_IFTYPE_ADHOC &&
sdata->vif.type != NL80211_IFTYPE_MESH_POINT);
+ WARN_ON_ONCE(sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE &&
+ changed & ~BSS_CHANGED_IDLE);
check_sdata_in_driver(sdata);
OpenPOWER on IntegriCloud