nl80211: look for HT/VHT capabilities in beacon's tail

Commit Message

Igor Mitsyanko Aug. 30, 2017, 8:52 p.m. UTC

From: Igor Mitsyanko <[e-mail]>

There are no HT/VHT capabilities in cfg80211_ap_settings::beacon_ies,
these should be looked for in beacon's tail instead.

Signed-off-by: Igor Mitsyanko <[e-mail]>
---

This is true for hostapd (at least the one in mainline): it does not
include HT/VHT caps and WLAN_EID_SUPP_RATES into beacon_ies.
But worth noting that there is no clear documentation that I could find
on what IEs could and could not be included into beacon_ies.

 net/wireless/nl80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Sergey Matyukevich Oct. 2, 2017, 3:34 p.m. UTC | #1

On Wed, Aug 30, 2017 at 01:52:25PM -0700, [e-mail] wrote:

> There are no HT/VHT capabilities in cfg80211_ap_settings::beacon_ies,
> these should be looked for in beacon's tail instead.
> 
> Signed-off-by: Igor Mitsyanko <[e-mail]>
> ---
> 
> This is true for hostapd (at least the one in mainline): it does not
> include HT/VHT caps and WLAN_EID_SUPP_RATES into beacon_ies.
> But worth noting that there is no clear documentation that I could find
> on what IEs could and could not be included into beacon_ies.
> 
>  net/wireless/nl80211.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Hello Johannes,

Any comments on this change ?

Regards,
Sergey

Johannes Berg Oct. 2, 2017, 3:57 p.m. UTC | #2

On Mon, 2017-10-02 at 18:34 +0300, Sergey Matyukevich wrote:
> On Wed, Aug 30, 2017 at 01:52:25PM -0700, igor.mitsyanko.os@quantenna
> .com wrote:
> 
> > There are no HT/VHT capabilities in
> > cfg80211_ap_settings::beacon_ies,
> > these should be looked for in beacon's tail instead.
> > 
> > Signed-off-by: Igor Mitsyanko <[e-mail]>
> > ---
> > 
> > This is true for hostapd (at least the one in mainline): it does
> > not
> > include HT/VHT caps and WLAN_EID_SUPP_RATES into beacon_ies.
> > But worth noting that there is no clear documentation that I could
> > find
> > on what IEs could and could not be included into beacon_ies.
> > 
> >  net/wireless/nl80211.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Hello Johannes,
> 
> Any comments on this change ?

It's already in linux.git ...

johannes

Patch

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 8ce8542..0df8023 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3791,8 +3791,8 @@  static void nl80211_check_ap_rate_selectors(struct cfg80211_ap_settings *params,
 static void nl80211_calculate_ap_params(struct cfg80211_ap_settings *params)
 {
 	const struct cfg80211_beacon_data *bcn = &params->beacon;
-	size_t ies_len = bcn->beacon_ies_len;
-	const u8 *ies = bcn->beacon_ies;
+	size_t ies_len = bcn->tail_len;
+	const u8 *ies = bcn->tail;
 	const u8 *rates;
 	const u8 *cap;