From 1a006f7d56418754942fe452038efcaa9ee5cf0d Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 10 Dec 2012 07:00:46 +0000
Subject: [PATCH] Adjust the channel to correctly setup the HT flags when
 transitioning an IBSS VAP to RUN.

An 11n IBSS was beaconing HTINFO/HTCAP IE's that didn't have any HT
information setup (like the HT TX/RX MCS bitmask.)

Tested:

* AR9280, IBSS - both a statically setup channel and a scanned channel

PR:		kern/172955
---
 sys/net80211/ieee80211_adhoc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
index 060dc6eea285..0220474abb8d 100644
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -171,7 +171,9 @@ adhoc_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg)
 				 * Already have a channel; bypass the
 				 * scan and startup immediately.
 				 */
-				ieee80211_create_ibss(vap, vap->iv_des_chan);
+				ieee80211_create_ibss(vap,
+				    ieee80211_ht_adjust_channel(ic,
+				    vap->iv_des_chan, vap->iv_flags_ht));
 				break;
 			}
 			/*