[src-draft/trunk]: src/sys/dev/usb Revert to previous.

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

details:   https://anonhg.NetBSD.org/src-all/rev/8b3a169466d6
branches:  trunk
changeset: 940320:8b3a169466d6
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Tue May 12 11:03:54 2020 +1000

description:
Revert to previous.
Backed out changeset 941bab203d3e
Something is wrong displaying the rates.  Need to investigate.

diffstat:

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

diffs (42 lines):

diff -r 78f529bbdab0 -r 8b3a169466d6 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Tue May 12 07:15:05 2020 +1000
+++ b/sys/dev/usb/if_urtwn.c    Tue May 12 11:03:54 2020 +1000
@@ -82,6 +82,7 @@
 #include <net80211/ieee80211_netbsd.h>
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_regdomain.h>
 
 #include <dev/firmload.h>
 
@@ -223,11 +224,6 @@
 #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);
@@ -3760,17 +3756,11 @@
 {
        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_add_channel_list_2ghz(chans, maxchans, nchans,
-           urtwn_chan_2ghz, nitems(urtwn_chan_2ghz), bands, IEEE80211_CHAN_HT20);
+        ieee80211_init_channels(ic, NULL, bands);
 }