diff options
| author | Eliad Peller <eliad@wizery.com> | 2012-02-19 15:26:09 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-27 14:06:31 -0500 |
| commit | 494f1fe559748a54bb30c066057dfae02d29676e (patch) | |
| tree | 70d22dbb48831b34c9aeaa8066b66cd70c2b9e74 /net/mac80211 | |
| parent | c393862faad6aa200ce3fbf03735eb54361e6a4c (diff) | |
| download | blackbird-op-linux-494f1fe559748a54bb30c066057dfae02d29676e.tar.gz blackbird-op-linux-494f1fe559748a54bb30c066057dfae02d29676e.zip | |
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>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 52133dab9297..7ece99a59805 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -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); } |
