Commit 1403b109 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

wifi: cfg80211/mac80211: Fix ML element common size calculation 



The common size is part of the length in the data
so don't add it again.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7b6f0877

include/linux/ieee80211.h

+5 −6
Original line number Diff line number Diff line
@@ -4573,18 +4573,17 @@ static inline u8 ieee80211_mle_common_size(const u8 *data) 


	switch (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE)) {

	case IEEE80211_ML_CONTROL_TYPE_BASIC:

		common += sizeof(struct ieee80211_mle_basic_common_info);

		break;

	case IEEE80211_ML_CONTROL_TYPE_PREQ:

		common += sizeof(struct ieee80211_mle_preq_common_info);

	case IEEE80211_ML_CONTROL_TYPE_TDLS:

		/*

		 * The length is the first octet pointed by mle->variable so no

		 * need to add anything

		 */

		break;

	case IEEE80211_ML_CONTROL_TYPE_RECONF:

		if (control & IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR)

			common += ETH_ALEN;

		return common;

	case IEEE80211_ML_CONTROL_TYPE_TDLS:

		common += sizeof(struct ieee80211_mle_tdls_common_info);

		break;

	case IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS:

		if (control & IEEE80211_MLC_PRIO_ACCESS_PRES_AP_MLD_MAC_ADDR)

			common += ETH_ALEN;