[src-draft/trunk]: src/sys/dev/pci Disable ng channels for now.

[Nathanial Sloss <nat%netbsd.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/07eaa7f68019
branches:  trunk
changeset: 950474:07eaa7f68019
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Tue May 12 03:57:20 2020 +1000

description:
Disable ng channels for now.
Standardize channel init.

diffstat:

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

diffs (32 lines):

diff -r 4104711a718e -r 07eaa7f68019 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Mon May 11 09:43:43 2020 +1000
+++ b/sys/dev/pci/if_iwn.c      Tue May 12 03:57:20 2020 +1000
@@ -72,6 +72,7 @@
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
 #include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_regdomain.h>
 
 #include <dev/firmload.h>
 
@@ -337,8 +338,6 @@
 #define DPRINTFN(n, x)
 #endif
 
-static const uint8_t iwn_chan_2ghz[] =
-        { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 };
 CFATTACH_DECL_NEW(iwn, sizeof(struct iwn_softc), iwn_match, iwn_attach,
        iwn_detach, NULL);
 
@@ -372,9 +371,8 @@
         memset(bands, 0, sizeof(bands));
         setbit(bands, IEEE80211_MODE_11B);
         setbit(bands, IEEE80211_MODE_11G);
-        setbit(bands, IEEE80211_MODE_11NG);
-        ieee80211_add_channel_list_2ghz(chans, maxchans, nchans,
-            iwn_chan_2ghz, nitems(iwn_chan_2ghz), bands, IEEE80211_CHAN_HT20);
+     // setbit(bands, IEEE80211_MODE_11NG);
+        ieee80211_init_channels(ic, NULL, bands);
 }
 
 static void