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

Commit e584da5e authored by Antonio Quartulli's avatar Antonio Quartulli Committed by Johannes Berg
Browse files

mac80211: in ADHOC don't update last_rx if sta is not authorized 



It does not make sense to keep a station alive if it is not authorised
at all. If IBSS/RSN is used it could also be the case that something
went wrong during the keys exchange and the stations ended up in a not
recoverable state.

By not updating last_rx we are giving the station a chance to be
deleted and to start the key exchange once again from scratch.

Signed-off-by: default avatarAntonio Quartulli <antonio@open-mesh.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c216e641

net/mac80211/rx.c

+7 −3
Original line number Diff line number Diff line
@@ -1341,13 +1341,17 @@ ieee80211_rx_h_sta_process(struct ieee80211_rx_data *rx) 


	/*

	 * Update last_rx only for IBSS packets which are for the current

	 * BSSID to avoid keeping the current IBSS network alive in cases

	 * where other STAs start using different BSSID.

	 * BSSID and for station already AUTHORIZED to avoid keeping the

	 * current IBSS network alive in cases where other STAs start

	 * using different BSSID. This will also give the station another

	 * chance to restart the authentication/authorization in case

	 * something went wrong the first time.

	 */

	if (rx->sdata->vif.type == NL80211_IFTYPE_ADHOC) {

		u8 *bssid = ieee80211_get_bssid(hdr, rx->skb->len,

						NL80211_IFTYPE_ADHOC);

		if (ether_addr_equal(bssid, rx->sdata->u.ibss.bssid)) {

		if (ether_addr_equal(bssid, rx->sdata->u.ibss.bssid) &&

		    test_sta_flag(sta, WLAN_STA_AUTHORIZED)) {

			sta->last_rx = jiffies;

			if (ieee80211_is_data(hdr->frame_control)) {

				sta->last_rx_rate_idx = status->rate_idx;