From owner-svn-src-head@FreeBSD.ORG  Mon Dec 10 07:00:47 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 2E106624;
 Mon, 10 Dec 2012 07:00:47 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 12B8E8FC13;
 Mon, 10 Dec 2012 07:00:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBA70ke4047080;
 Mon, 10 Dec 2012 07:00:46 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBA70kO7047079;
 Mon, 10 Dec 2012 07:00:46 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201212100700.qBA70kO7047079@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 10 Dec 2012 07:00:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244078 - head/sys/net80211
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Dec 2012 07:00:47 -0000

Author: adrian
Date: Mon Dec 10 07:00:46 2012
New Revision: 244078
URL: http://svnweb.freebsd.org/changeset/base/244078

Log:
  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

Modified:
  head/sys/net80211/ieee80211_adhoc.c

Modified: head/sys/net80211/ieee80211_adhoc.c
==============================================================================
--- head/sys/net80211/ieee80211_adhoc.c	Mon Dec 10 05:14:34 2012	(r244077)
+++ head/sys/net80211/ieee80211_adhoc.c	Mon Dec 10 07:00:46 2012	(r244078)
@@ -171,7 +171,9 @@ adhoc_newstate(struct ieee80211vap *vap,
 				 * 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;
 			}
 			/*