Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcac4fb0 authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

mac80211: call ieee80211_recalc_idle() after sending packets 



Some drivers (e.g. ath9k) assume that it's safe to go into low-power mode
immediately after the idle state changes. To support that, mac80211 even
calls drv_flush() before that happens.
In some instances, mac80211 sent a packet right after recalculating the
idle state, this patch fixes that.

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1f80c230

net/mac80211/mlme.c

+9 −6
Original line number Diff line number Diff line
@@ -1357,9 +1357,6 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata) 
	ieee80211_set_disassoc(sdata, true, true);

	mutex_unlock(&ifmgd->mtx);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);

	/*

	 * must be outside lock due to cfg80211,

	 * but that's not a problem.
@@ -1368,6 +1365,10 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata) 
				       IEEE80211_STYPE_DEAUTH,

				       WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY,

				       NULL, true);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);

}



void ieee80211_beacon_connection_loss_work(struct work_struct *work)
@@ -2134,9 +2135,6 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata, 


	ieee80211_set_disassoc(sdata, true, true);

	mutex_unlock(&ifmgd->mtx);

	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);

	/*

	 * must be outside lock due to cfg80211,

	 * but that's not a problem.
@@ -2144,6 +2142,11 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata, 
	ieee80211_send_deauth_disassoc(sdata, bssid,

			IEEE80211_STYPE_DEAUTH, reason,

			NULL, true);



	mutex_lock(&local->mtx);

	ieee80211_recalc_idle(local);

	mutex_unlock(&local->mtx);



	mutex_lock(&ifmgd->mtx);

}

net/mac80211/offchannel.c

+2 −2
Original line number Diff line number Diff line
@@ -211,8 +211,6 @@ static void ieee80211_hw_roc_start(struct work_struct *work) 
		return;

	}



	ieee80211_recalc_idle(local);



	if (local->hw_roc_skb) {

		sdata = IEEE80211_DEV_TO_SUB_IF(local->hw_roc_dev);

		ieee80211_tx_skb(sdata, local->hw_roc_skb);
@@ -226,6 +224,8 @@ static void ieee80211_hw_roc_start(struct work_struct *work) 
					  GFP_KERNEL);

	}



	ieee80211_recalc_idle(local);



	mutex_unlock(&local->mtx);

}