Attachment 150980 Details for Bug 196290 – [net80211] don't send HT info bits in association requests if we're not on a HT channel

[patch] [net80211] don't send HT info bits in association requests if we're not on a HT channel

20141226-pr196290-dont-send-htcap-for-non-ht-chan-1.diff (text/plain), 1.41 KB, created by Adrian Chadd on 2014-12-27 07:22:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Chadd

Created: 2014-12-27 07:22:00 UTC

Size: 1.41 KB

patch

obsolete

>Index: sys/net80211/ieee80211_output.c
>===================================================================
>--- sys/net80211/ieee80211_output.c	(revision 276105)
>+++ sys/net80211/ieee80211_output.c	(working copy)
>@@ -2322,18 +2322,33 @@
> 			    ic->ic_curchan);
> 			frm = ieee80211_add_supportedchannels(frm, ic);
> 		}
>+
>+		/*
>+		 * Check the channel - we may be using an 11n NIC with an
>+		 * 11n capable station, but we're configured to be an 11b
>+		 * channel.
>+		 */
> 		if ((vap->iv_flags_ht & IEEE80211_FHT_HT) &&
>+		    IEEE80211_IS_CHAN_HT(ni->ni_chan) &&
> 		    ni->ni_ies.htcap_ie != NULL &&
>-		    ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_HTCAP)
>+		    ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_HTCAP) {
> 			frm = ieee80211_add_htcap(frm, ni);
>+		}
> 		frm = ieee80211_add_wpa(frm, vap);
> 		if ((ic->ic_flags & IEEE80211_F_WME) &&
> 		    ni->ni_ies.wme_ie != NULL)
> 			frm = ieee80211_add_wme_info(frm, &ic->ic_wme);
>+
>+		/*
>+		 * Same deal - only send HT info if we're on an 11n
>+		 * capable channel.
>+		 */
> 		if ((vap->iv_flags_ht & IEEE80211_FHT_HT) &&
>+		    IEEE80211_IS_CHAN_HT(ni->ni_chan) &&
> 		    ni->ni_ies.htcap_ie != NULL &&
>-		    ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_VENDOR)
>+		    ni->ni_ies.htcap_ie[0] == IEEE80211_ELEMID_VENDOR) {
> 			frm = ieee80211_add_htcap_vendor(frm, ni);
>+		}
> #ifdef IEEE80211_SUPPORT_SUPERG
> 		if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_F_ATHEROS)) {
> 			frm = ieee80211_add_ath(frm,

Actions: View | Diff

Attachments on bug 196290: 150980