svn commit: r313985 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Mon Feb 20 04:02:50 2017
New Revision: 313985
URL: https://svnweb.freebsd.org/changeset/base/313985

Log:
  [net80211] teach the probe response routine to add VHT IEs as appropriate.

Modified:
  head/sys/net80211/ieee80211_output.c

Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c	Mon Feb 20 04:02:29 2017	(r313984)
+++ head/sys/net80211/ieee80211_output.c	Mon Feb 20 04:02:50 2017	(r313985)
@@ -2733,6 +2733,8 @@ ieee80211_alloc_proberesp(struct ieee802
 	 *	[tlv] RSN (optional)
 	 *	[tlv] HT capabilities
 	 *	[tlv] HT information
+	 *	[tlv] VHT capabilities
+	 *	[tlv] VHT information
 	 *	[tlv] WPA (optional)
 	 *	[tlv] WME (optional)
 	 *	[tlv] Vendor OUI HT capabilities (optional)
@@ -2763,6 +2765,8 @@ ieee80211_alloc_proberesp(struct ieee802
 	       + sizeof(struct ieee80211_wme_param)
 	       + 4 + sizeof(struct ieee80211_ie_htcap)
 	       + 4 + sizeof(struct ieee80211_ie_htinfo)
+	       +  sizeof(struct ieee80211_ie_vhtcap)
+	       +  sizeof(struct ieee80211_ie_vht_operation)
 #ifdef IEEE80211_SUPPORT_SUPERG
 	       + sizeof(struct ieee80211_ath_ie)
 #endif
@@ -2842,6 +2846,11 @@ ieee80211_alloc_proberesp(struct ieee802
 		frm = ieee80211_add_htcap(frm, bss);
 		frm = ieee80211_add_htinfo(frm, bss);
 	}
+	if (IEEE80211_IS_CHAN_VHT(bss->ni_chan) &&
+	    legacy != IEEE80211_SEND_LEGACY_11B) {
+		frm = ieee80211_add_vhtcap(frm, bss);
+		frm = ieee80211_add_vhtinfo(frm, bss);
+	}
 	frm = ieee80211_add_wpa(frm, vap);
 	if (vap->iv_flags & IEEE80211_F_WME)
 		frm = ieee80211_add_wme_param(frm, &ic->ic_wme);