dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

mac80211: don't queue monitor work for HW_CONNECTION_MONITOR 

Devices that monitor the connection in the hw don't need
the monitor work in the driver.

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Eliad Peller 2012-02-19 15:26:09 +02:00 committed by John W. Linville
parent c393862faa
commit 494f1fe559
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/mac80211/mlme.c
View File

@ -2974,13 +2974,17 @@ static void ieee80211_sta_monitor_work(struct work_struct *work)
static void ieee80211_restart_sta_timer(struct ieee80211_sub_if_data *sdata)
{
u32 flags;
if (sdata->vif.type == NL80211_IFTYPE_STATION) {
sdata->u.mgd.flags &= ~(IEEE80211_STA_BEACON_POLL |
IEEE80211_STA_CONNECTION_POLL);
/* let's probe the connection once */
ieee80211_queue_work(&sdata->local->hw,
&sdata->u.mgd.monitor_work);
flags = sdata->local->hw.flags;
if (!(flags & IEEE80211_HW_CONNECTION_MONITOR))
ieee80211_queue_work(&sdata->local->hw,
&sdata->u.mgd.monitor_work);
/* and do all the other regular work too */
ieee80211_queue_work(&sdata->local->hw, &sdata->work);
}