[src/trunk]: src/sys/dev/pci Not all iwm hardware supports the 5GHz band. Ma...

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4cc9bd3ba394
branches:  trunk
changeset: 336892:4cc9bd3ba394
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Thu Mar 26 14:42:56 2015 +0000

description:
Not all iwm hardware supports the 5GHz band.  Make setting 11a rates
and scanning conditional on the 5GHz support bit in the nvm.

>From OpenBSD rev. 1.39. Arranged by me.

diffstat:

 sys/dev/pci/if_iwm.c |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 5c17a22eb1b2 -r 4cc9bd3ba394 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Thu Mar 26 13:34:51 2015 +0000
+++ b/sys/dev/pci/if_iwm.c      Thu Mar 26 14:42:56 2015 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: if_iwm.c,v 1.28 2015/03/07 13:54:57 nonaka Exp $       */
-/*     OpenBSD: if_iwm.c,v 1.36 2015/03/06 18:39:24 kettenis Exp       */
+/*     $NetBSD: if_iwm.c,v 1.29 2015/03/26 14:42:56 nonaka Exp $       */
+/*     OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp    */
 
 /*
  * Copyright (c) 2014 genua mbh <info%genua.de@localhost>
@@ -105,7 +105,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.28 2015/03/07 13:54:57 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.29 2015/03/26 14:42:56 nonaka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -5587,7 +5587,8 @@
 
        DPRINTF(("scan ended\n"));
 
-       if (sc->sc_scanband == IEEE80211_CHAN_2GHZ) {
+       if (sc->sc_scanband == IEEE80211_CHAN_2GHZ &&
+           sc->sc_nvm.sku_cap_band_52GHz_enable) {
                int error;
                done = 0;
                if ((error = iwm_mvm_scan_request(sc,
@@ -6567,7 +6568,9 @@
            IEEE80211_C_SHSLOT |        /* short slot time supported */
            IEEE80211_C_SHPREAMBLE;     /* short preamble supported */
 
-       ic->ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
+       /* not all hardware can do 5GHz band */
+       if (sc->sc_nvm.sku_cap_band_52GHz_enable)
+               ic->ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
        ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b;
        ic->ic_sup_rates[IEEE80211_MODE_11G] = ieee80211_std_rateset_11g;