Commit 494f1fe5 authored by Eliad Peller's avatar Eliad Peller Committed by John W. Linville
Browse files

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: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c393862f

net/mac80211/mlme.c

+6 −2
Original line number Diff line number Diff line
@@ -2974,11 +2974,15 @@ 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 */

		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 */