Commit 86b2dac2 authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: initialize SMPS mode correctly 

The SMPS mode is currently re-initialized too late, since
ieee80211_prep_channel() can be called again after we've
already done ieee80211_setup_assoc_link(), in case there's
some override of the channel configuration. Fix this.

Link: https://msgid.link/20240129195405.d6d74508be18.I0a7303b1ce4d8e5436011951ab624372a445c069@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 733c498a

net/mac80211/mlme.c

+3 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright 2007, Michael Wu <flamingice@sourmilk.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (C) 2015 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2023 Intel Corporation

 * Copyright (C) 2018 - 2024 Intel Corporation

 */



#include <linux/delay.h>
@@ -2918,6 +2918,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, 


	/* other links will be destroyed */

	sdata->deflink.u.mgd.bss = NULL;

	sdata->deflink.smps_mode = IEEE80211_SMPS_OFF;



	netif_carrier_off(sdata->dev);
@@ -5045,9 +5046,6 @@ static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, 
	if (!link)

		return 0;



	/* will change later if needed */

	link->smps_mode = IEEE80211_SMPS_OFF;



	/*

	 * If this fails (possibly due to channel context sharing

	 * on incompatible channels, e.g. 80+80 and 160 sharing the
@@ -7096,6 +7094,7 @@ void ieee80211_mgd_setup_link(struct ieee80211_link_data *link) 
	link->u.mgd.p2p_noa_index = -1;

	link->u.mgd.conn_flags = 0;

	link->conf->bssid = link->u.mgd.bssid;

	link->smps_mode = IEEE80211_SMPS_OFF;



	wiphy_work_init(&link->u.mgd.request_smps_work,

			ieee80211_request_smps_mgd_work);