[src-draft/trunk]: src/sys/dev/usb Backed out changeset ac3e8765b35b

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

details:   https://anonhg.NetBSD.org/src-all/rev/bc825449ec21
branches:  trunk
changeset: 948906:bc825449ec21
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Tue May 12 07:15:05 2020 +1000

description:
Backed out changeset ac3e8765b35b

diffstat:

 sys/dev/usb/if_urtwn.c |  14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (42 lines):

diff -r 0863e1fa49e9 -r bc825449ec21 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Tue May 12 07:09:56 2020 +1000
+++ b/sys/dev/usb/if_urtwn.c    Tue May 12 07:15:05 2020 +1000
@@ -82,7 +82,6 @@
 #include <net80211/ieee80211_netbsd.h>
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
-#include <net80211/ieee80211_regdomain.h>
 
 #include <dev/firmload.h>
 
@@ -224,6 +223,11 @@
 #undef URTWN_RTL8188E_DEV
 #undef URTWN_RTL8192EU_DEV
 
+/* urtwn data */
+static const uint8_t urtwn_chan_2ghz[] =
+        { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 };
+
+
 static int     urtwn_match(device_t, cfdata_t, void *);
 static void    urtwn_attach(device_t, device_t, void *);
 static int     urtwn_detach(device_t, int);
@@ -3756,11 +3760,17 @@
 {
        uint8_t bands[IEEE80211_MODE_BYTES];
 
+       /*
+        * NNN Should be able to do something based on chip if
+        * a chip has more bands .... eg. N ... but for the future.
+        */
+
        memset(bands, 0, sizeof(bands));
        setbit(bands, IEEE80211_MODE_11B);
        setbit(bands, IEEE80211_MODE_11G);
        setbit(bands, IEEE80211_MODE_11NG);
-        ieee80211_init_channels(ic, NULL, bands);
+       ieee80211_add_channel_list_2ghz(chans, maxchans, nchans,
+           urtwn_chan_2ghz, nitems(urtwn_chan_2ghz), bands, IEEE80211_CHAN_HT20);
 }