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

wireless: fix VHT max AMPDU exponent definition 



This is really a 3-bit field, not a single bit,
so declare a mask and shift. Also fix hwsim, it
advertises the maximum possible.

While at it reindent all the defines using tabs
instead of spaces.

Change-Id: I7cd81c0d72f76deb5010aba5bfa3dd312006e898
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 815b8092

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -2223,7 +2223,7 @@ static int __init init_mac80211_hwsim(void) 
				IEEE80211_VHT_CAP_RXSTBC_2 |

				IEEE80211_VHT_CAP_RXSTBC_3 |

				IEEE80211_VHT_CAP_RXSTBC_4 |

				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT;

				IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK;

			sband->vht_cap.vht_mcs.rx_mcs_map =

				cpu_to_le16(IEEE80211_VHT_MCS_SUPPORT_0_8 << 0 |

					    IEEE80211_VHT_MCS_SUPPORT_0_8 << 2 |

include/linux/ieee80211.h

+28 −26
Original line number Diff line number Diff line
@@ -1272,7 +1272,9 @@ struct ieee80211_vht_operation { 
#define IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE			0x00100000

#define IEEE80211_VHT_CAP_VHT_TXOP_PS				0x00200000

#define IEEE80211_VHT_CAP_HTC_VHT				0x00400000

#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT          0x00800000

#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT	23

#define IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK	\

		(7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT)

#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB	0x08000000

#define IEEE80211_VHT_CAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB	0x0c000000

#define IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN			0x10000000

CRA Git | Maintained and supported by SUSTech CRA and CCSE