Commit c6e37ed4 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: move CRC into struct ieee802_11_elems 

We're currently returning this value, but to prepare for
returning the allocated structure, move it into there.

Link: https://lore.kernel.org/r/20210920154009.479b8ebf999d.If0d4ba75ee38998dc3eeae25058aa748efcb2fc9@changeid


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

net/mac80211/ieee80211_i.h

+5 −4
Original line number Diff line number Diff line
@@ -1507,6 +1507,7 @@ struct ieee80211_csa_ie { 
struct ieee802_11_elems {

	const u8 *ie_start;

	size_t total_len;

	u32 crc;



	/* pointers to IEs */

	const struct ieee80211_tdls_lnkie *lnk_id;
@@ -2193,7 +2194,7 @@ static inline void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, 
	ieee80211_tx_skb_tid(sdata, skb, 7);

}



u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,

void ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,

				struct ieee802_11_elems *elems,

				u64 filter, u32 crc, u8 *transmitter_bssid,

				u8 *bss_bssid);

net/mac80211/mlme.c

+5 −4
Original line number Diff line number Diff line
@@ -4070,10 +4070,11 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
	 */

	if (!ieee80211_is_s1g_beacon(hdr->frame_control))

		ncrc = crc32_be(0, (void *)&mgmt->u.beacon.beacon_int, 4);

	ncrc = ieee802_11_parse_elems_crc(variable,

	ieee802_11_parse_elems_crc(variable,

				   len - baselen, false, &elems,

				   care_about_ies, ncrc,

				   mgmt->bssid, bssid);

	ncrc = elems.crc;



	if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK) &&

	    ieee80211_check_tim(elems.tim, elems.tim_len, bss_conf->aid)) {

net/mac80211/util.c

+5 −5
Original line number Diff line number Diff line
@@ -1461,7 +1461,7 @@ static size_t ieee802_11_find_bssid_profile(const u8 *start, size_t len, 
	return found ? profile_len : 0;

}



u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,

void ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action,

				struct ieee802_11_elems *elems,

				u64 filter, u32 crc, u8 *transmitter_bssid,

				u8 *bss_bssid)
@@ -1516,7 +1516,7 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, 


	kfree(nontransmitted_profile);



	return crc;

	elems->crc = crc;

}



void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata,