Commit 3aca362a authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: remove redundant ML element check 



If "ml_basic" is assigned, we already know that the type
of ML element is basic, so we don't need to check again,
that check can never happen. Simplify the code.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Reviewed-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20240102213313.bb9b636e66f6.I7fc0897022142d46f39ac0b912a4f7b0f1b6ea26@changeid


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

net/mac80211/mlme.c

+10 −19
Original line number Diff line number Diff line
@@ -5407,23 +5407,15 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
		}



		if (ieee80211_vif_is_mld(&sdata->vif)) {

			struct ieee80211_mle_basic_common_info *common;



			if (!elems->ml_basic) {

				sdata_info(sdata,

					   "MLO association with %pM but no multi-link element in response!\n",

					   "MLO association with %pM but no (basic) multi-link element in response!\n",

					   assoc_data->ap_addr);

				goto abandon_assoc;

			}



			if (le16_get_bits(elems->ml_basic->control,

					  IEEE80211_ML_CONTROL_TYPE) !=

					IEEE80211_ML_CONTROL_TYPE_BASIC) {

				sdata_info(sdata,

					   "bad multi-link element (control=0x%x)\n",

					   le16_to_cpu(elems->ml_basic->control));

				goto abandon_assoc;

			} else {

				struct ieee80211_mle_basic_common_info *common;



			common = (void *)elems->ml_basic->variable;



			if (memcmp(assoc_data->ap_addr,
@@ -5435,7 +5427,6 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, 
				goto abandon_assoc;

			}

		}

		}



		sdata->vif.cfg.aid = aid;