From owner-svn-src-all@FreeBSD.ORG Sun Feb 1 22:24:08 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A885F106566C; Sun, 1 Feb 2009 22:24:08 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 969708FC1F; Sun, 1 Feb 2009 22:24:08 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n11MO8tK067989; Sun, 1 Feb 2009 22:24:08 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n11MO85p067988; Sun, 1 Feb 2009 22:24:08 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200902012224.n11MO85p067988@svn.freebsd.org> From: Sam Leffler Date: Sun, 1 Feb 2009 22:24:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187991 - head/sys/net80211 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2009 22:24:09 -0000 Author: sam Date: Sun Feb 1 22:24:08 2009 New Revision: 187991 URL: http://svn.freebsd.org/changeset/base/187991 Log: when promoting an 11b channel to 11g do not accept a ``pure G'' (OFDM only) channel, only accept a real 11g channel; this fixes a problem where we were wrongly promoting 11b to a Dynamic Turbo G channel which broke scanning on channel 6 Modified: head/sys/net80211/ieee80211_scan_sta.c Modified: head/sys/net80211/ieee80211_scan_sta.c ============================================================================== --- head/sys/net80211/ieee80211_scan_sta.c Sun Feb 1 21:50:07 2009 (r187990) +++ head/sys/net80211/ieee80211_scan_sta.c Sun Feb 1 22:24:08 2009 (r187991) @@ -395,12 +395,12 @@ find11gchannel(struct ieee80211com *ic, */ for (j = i+1; j < ic->ic_nchans; j++) { c = &ic->ic_channels[j]; - if (c->ic_freq == freq && IEEE80211_IS_CHAN_ANYG(c)) + if (c->ic_freq == freq && IEEE80211_IS_CHAN_G(c)) return c; } for (j = 0; j < i; j++) { c = &ic->ic_channels[j]; - if (c->ic_freq == freq && IEEE80211_IS_CHAN_ANYG(c)) + if (c->ic_freq == freq && IEEE80211_IS_CHAN_G(c)) return c; } return NULL;