svn commit: r311677 - head/sys/net80211

[Adrian Chadd]

Author: adrian
Date: Sun Jan  8 10:07:54 2017
New Revision: 311677
URL: https://svnweb.freebsd.org/changeset/base/311677

Log:
  [net80211] use the correct freq2 field when populating VHT operation element.
  
  Whilst here, leave a TODO comment so I revisit this routine in the context
  of hostap operation probe requests for IBSS/mesh.

Modified:
  head/sys/net80211/ieee80211_vht.c

Modified: head/sys/net80211/ieee80211_vht.c
==============================================================================
--- head/sys/net80211/ieee80211_vht.c	Sun Jan  8 09:18:08 2017	(r311676)
+++ head/sys/net80211/ieee80211_vht.c	Sun Jan  8 10:07:54 2017	(r311677)
@@ -352,6 +352,14 @@ ieee80211_vht_get_chwidth_ie(struct ieee
 /*
  * Note: this just uses the current channel information;
  * it doesn't use the node info after parsing.
+ *
+ * XXX TODO: need to make the basic MCS set configurable.
+ * XXX TODO: read 802.11-2013 to determine what to set
+ *           chwidth to when scanning.  I have a feeling
+ *           it isn't involved in scanning and we shouldn't
+ *           be sending it; and I don't yet know what to set
+ *           it to for IBSS or hostap where the peer may be
+ *           a completely different channel width to us.
  */
 uint8_t *
 ieee80211_add_vhtinfo(uint8_t *frm, struct ieee80211_node *ni)
@@ -380,7 +388,7 @@ ieee80211_add_vhtinfo(uint8_t *frm, stru
 	*frm++ = ni->ni_chan->ic_vht_ch_freq1;
 
 	/* 8-bit freq2 */
-	*frm++ = ni->ni_chan->ic_vht_ch_freq1;
+	*frm++ = ni->ni_chan->ic_vht_ch_freq2;
 
 	/* 16-bit basic MCS set - just MCS0..7 for NSS=1 for now */
 	ADDSHORT(frm, 0xfffc);