From owner-svn-src-head@freebsd.org  Sun Apr  3 14:38:28 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59752B00C9E;
 Sun,  3 Apr 2016 14:38:28 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 26EF71110;
 Sun,  3 Apr 2016 14:38:28 +0000 (UTC)
 (envelope-from avos@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u33EcRp0054764;
 Sun, 3 Apr 2016 14:38:27 GMT (envelope-from avos@FreeBSD.org)
Received: (from avos@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33EcRe5054762;
 Sun, 3 Apr 2016 14:38:27 GMT (envelope-from avos@FreeBSD.org)
Message-Id: <201604031438.u33EcRe5054762@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: avos set sender to
 avos@FreeBSD.org using -f
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Sun, 3 Apr 2016 14:38:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297524 - in head/sys/dev: iwn wpi
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.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Apr 2016 14:38:28 -0000

Author: avos
Date: Sun Apr  3 14:38:26 2016
New Revision: 297524
URL: https://svnweb.freebsd.org/changeset/base/297524

Log:
  wpi, iwn: fix check in find_eeprom_channel()
  
  Return correct eeprom_chan structure pointer for 7, 8, 11 and 12 5Ghz
  channels.

Modified:
  head/sys/dev/iwn/if_iwn.c
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Sun Apr  3 14:38:02 2016	(r297523)
+++ head/sys/dev/iwn/if_iwn.c	Sun Apr  3 14:38:26 2016	(r297524)
@@ -2554,7 +2554,8 @@ iwn_find_eeprom_channel(struct iwn_softc
 	} else {
 		for (j = 0; j < 5; j++) {
 			for (i = 0; i < iwn_bands[j].nchan; i++) {
-				if (iwn_bands[j].chan[i] == c->ic_ieee)
+				if (iwn_bands[j].chan[i] == c->ic_ieee &&
+				    ((j == 0) ^ IEEE80211_IS_CHAN_A(c)) == 1)
 					return &sc->eeprom_channels[j][i];
 			}
 		}

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun Apr  3 14:38:02 2016	(r297523)
+++ head/sys/dev/wpi/if_wpi.c	Sun Apr  3 14:38:26 2016	(r297524)
@@ -1503,7 +1503,8 @@ wpi_find_eeprom_channel(struct wpi_softc
 
 	for (j = 0; j < WPI_CHAN_BANDS_COUNT; j++)
 		for (i = 0; i < wpi_bands[j].nchan; i++)
-			if (wpi_bands[j].chan[i] == c->ic_ieee)
+			if (wpi_bands[j].chan[i] == c->ic_ieee &&
+			    ((j == 0) ^ IEEE80211_IS_CHAN_A(c)) == 1)
 				return &sc->eeprom_channels[j][i];
 
 	return NULL;