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>
This commit is contained in:
Родитель
b8dc1a35c8
Коммит
ad2d223aa9
|
@ -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);
|
||||
|
||||
|
|
|
@ -1227,6 +1227,7 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
|
|||
case NL80211_IFTYPE_AP:
|
||||
skb_queue_head_init(&sdata->u.ap.ps.bc_buf);
|
||||
INIT_LIST_HEAD(&sdata->u.ap.vlans);
|
||||
sdata->vif.bss_conf.bssid = sdata->vif.addr;
|
||||
break;
|
||||
case NL80211_IFTYPE_P2P_CLIENT:
|
||||
type = NL80211_IFTYPE_STATION;
|
||||
|
@ -1234,9 +1235,11 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
|
|||
sdata->vif.p2p = true;
|
||||
/* fall through */
|
||||
case NL80211_IFTYPE_STATION:
|
||||
sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;
|
||||
ieee80211_sta_setup_sdata(sdata);
|
||||
break;
|
||||
case NL80211_IFTYPE_ADHOC:
|
||||
sdata->vif.bss_conf.bssid = sdata->u.ibss.bssid;
|
||||
ieee80211_ibss_setup_sdata(sdata);
|
||||
break;
|
||||
case NL80211_IFTYPE_MESH_POINT:
|
||||
|
@ -1250,8 +1253,12 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
|
|||
MONITOR_FLAG_OTHER_BSS;
|
||||
break;
|
||||
case NL80211_IFTYPE_WDS:
|
||||
sdata->vif.bss_conf.bssid = NULL;
|
||||
break;
|
||||
case NL80211_IFTYPE_AP_VLAN:
|
||||
break;
|
||||
case NL80211_IFTYPE_P2P_DEVICE:
|
||||
sdata->vif.bss_conf.bssid = sdata->vif.addr;
|
||||
break;
|
||||
case NL80211_IFTYPE_UNSPECIFIED:
|
||||
case NUM_NL80211_IFTYPES:
|
||||
|
|
|
@ -207,30 +207,10 @@ void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata,
|
|||
u32 changed)
|
||||
{
|
||||
struct ieee80211_local *local = sdata->local;
|
||||
static const u8 zero[ETH_ALEN] = { 0 };
|
||||
|
||||
if (!changed)
|
||||
return;
|
||||
|
||||
if (sdata->vif.type == NL80211_IFTYPE_STATION) {
|
||||
sdata->vif.bss_conf.bssid = sdata->u.mgd.bssid;
|
||||
} else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
|
||||
sdata->vif.bss_conf.bssid = sdata->u.ibss.bssid;
|
||||
else if (sdata->vif.type == NL80211_IFTYPE_AP)
|
||||
sdata->vif.bss_conf.bssid = sdata->vif.addr;
|
||||
else if (sdata->vif.type == NL80211_IFTYPE_WDS)
|
||||
sdata->vif.bss_conf.bssid = NULL;
|
||||
else if (ieee80211_vif_is_mesh(&sdata->vif)) {
|
||||
sdata->vif.bss_conf.bssid = zero;
|
||||
} else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
|
||||
sdata->vif.bss_conf.bssid = sdata->vif.addr;
|
||||
WARN_ONCE(changed & ~(BSS_CHANGED_IDLE),
|
||||
"P2P Device BSS changed %#x", changed);
|
||||
} else {
|
||||
WARN_ON(1);
|
||||
return;
|
||||
}
|
||||
|
||||
drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed);
|
||||
}
|
||||
|
||||
|
|
|
@ -810,6 +810,7 @@ void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
|
|||
void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
|
||||
{
|
||||
struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
|
||||
static u8 zero_addr[ETH_ALEN] = {};
|
||||
|
||||
setup_timer(&ifmsh->housekeeping_timer,
|
||||
ieee80211_mesh_housekeeping_timer,
|
||||
|
@ -835,4 +836,6 @@ void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
|
|||
INIT_LIST_HEAD(&ifmsh->preq_queue.list);
|
||||
spin_lock_init(&ifmsh->mesh_preq_queue_lock);
|
||||
spin_lock_init(&ifmsh->sync_offset_lock);
|
||||
|
||||
sdata->vif.bss_conf.bssid = zero_addr;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче