evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac80211: fix hardware scan completion

Browse source 
The mac80211 MLME requires restarting timers after a scan
completes but this wasn't done when hardware scan offload
was added, so add it now.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Tested-by: Bill Moss <bmoss@clemson.edu>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2008-03-05 10:58:40 +01:00 • committed by John W. Linville
parent 2a8ca29a88
commit 69d3b6f491
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
net/mac80211/ieee80211_sta.c
View file

@ -3576,6 +3576,13 @@ static void ieee80211_send_nullfunc(struct ieee80211_local *local,
} }
static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
{
if (sdata->vif.type == IEEE80211_IF_TYPE_STA ||
ieee80211_vif_is_mesh(&sdata->vif))
ieee80211_sta_timer((unsigned long)sdata);
}
void ieee80211_scan_completed(struct ieee80211_hw *hw) void ieee80211_scan_completed(struct ieee80211_hw *hw)
{ {
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
@ -3589,6 +3596,12 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
if (local->sta_hw_scanning) { if (local->sta_hw_scanning) {
local->sta_hw_scanning = 0; local->sta_hw_scanning = 0;
/* Restart STA timer for HW scan case */
rcu_read_lock();
list_for_each_entry_rcu(sdata, &local->interfaces, list)
ieee80211_restart_sta_timer(sdata);
rcu_read_unlock();
goto done; goto done;
} }
@ -3615,14 +3628,12 @@ void ieee80211_scan_completed(struct ieee80211_hw *hw)
if (sdata->dev == local->mdev) if (sdata->dev == local->mdev)
continue; continue;
if (sdata->vif.type == IEEE80211_IF_TYPE_STA) { /* Tell AP we're back */
if (sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED) if (sdata->vif.type == IEEE80211_IF_TYPE_STA &&
ieee80211_send_nullfunc(local, sdata, 0); sdata->u.sta.flags & IEEE80211_STA_ASSOCIATED)
ieee80211_sta_timer((unsigned long)sdata); ieee80211_send_nullfunc(local, sdata, 0);
}
if (sdata->vif.type == IEEE80211_IF_TYPE_MESH_POINT) ieee80211_restart_sta_timer(sdata);
ieee80211_sta_timer((unsigned long)sdata);
netif_wake_queue(sdata->dev); netif_wake_queue(sdata->dev);
} }