From owner-svn-src-head@FreeBSD.ORG  Fri Jun  5 06:49:09 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 35C48E9D;
 Fri,  5 Jun 2015 06:49:09 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2380C1F9B;
 Fri,  5 Jun 2015 06:49:09 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t556n9xn007674;
 Fri, 5 Jun 2015 06:49:09 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t556n9LI007673;
 Fri, 5 Jun 2015 06:49:09 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201506050649.t556n9LI007673@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 5 Jun 2015 06:49:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284014 - 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.20
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: Fri, 05 Jun 2015 06:49:09 -0000

Author: adrian
Date: Fri Jun  5 06:49:08 2015
New Revision: 284014
URL: https://svnweb.freebsd.org/changeset/base/284014

Log:
  For now, just default to presenting "found" channels as 11g, not 11b.
  
  The intel 7260 driver under development requires this - the scans come
  in as normal frames but with the frequency provided.  The correct method
  is to have the driver provide flags (so we can determine if it's 11b
  or 11g); this will have to do in the meantime.
  
  Without this, the channel found is 11b, and no ERP (ie "11g") bits
  are negotiated with the AP.
  
  This allows the 7260 in 2ghz mode to operate in 11bg, rather than
  just 11b.
  
  Tested:
  
  * intel 7260 driver, 11bg channels

Modified:
  head/sys/net80211/ieee80211.c

Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c	Fri Jun  5 06:46:11 2015	(r284013)
+++ head/sys/net80211/ieee80211.c	Fri Jun  5 06:49:08 2015	(r284014)
@@ -1081,7 +1081,7 @@ ieee80211_lookup_channel_rxstatus(struct
 	/* Determine a band */
 	/* XXX should be done by the driver? */
 	if (rxs->c_freq < 3000) {
-		flags = IEEE80211_CHAN_B;
+		flags = IEEE80211_CHAN_G;
 	} else {
 		flags = IEEE80211_CHAN_A;
 	}