Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev GC private 802.11 rateset declarations, use the stan...



details:   https://anonhg.NetBSD.org/src/rev/114e193b2363
branches:  trunk
changeset: 322383:114e193b2363
user:      maya <maya%NetBSD.org@localhost>
date:      Tue May 01 16:18:13 2018 +0000

description:
GC private 802.11 rateset declarations, use the standard ones.

Build tested only.

diffstat:

 sys/dev/ic/atw.c      |  13 ++++---------
 sys/dev/ic/rt2560.c   |  22 +++++-----------------
 sys/dev/ic/rt2661.c   |  24 ++++++------------------
 sys/dev/pci/if_ipw.c  |  12 +++---------
 sys/dev/pci/if_iwi.c  |  22 +++++-----------------
 sys/dev/pci/if_iwn.c  |  22 +++++-----------------
 sys/dev/usb/if_atu.c  |  10 +++-------
 sys/dev/usb/if_rum.c  |  22 +++++-----------------
 sys/dev/usb/if_ural.c |  22 +++++-----------------
 sys/dev/usb/if_zyd.c  |  14 ++++----------
 10 files changed, 45 insertions(+), 138 deletions(-)

diffs (truncated from 501 to 300 lines):

diff -r 5a21ab3b99ee -r 114e193b2363 sys/dev/ic/atw.c
--- a/sys/dev/ic/atw.c  Tue May 01 16:16:05 2018 +0000
+++ b/sys/dev/ic/atw.c  Tue May 01 16:18:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atw.c,v 1.162 2017/10/23 09:25:31 msaitoh Exp $  */
+/*     $NetBSD: atw.c,v 1.163 2018/05/01 16:18:13 maya Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.162 2017/10/23 09:25:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.163 2018/05/01 16:18:13 maya Exp $");
 
 
 #include <sys/param.h>
@@ -514,7 +514,7 @@
        };
        struct ieee80211com *ic = &sc->sc_ic;
        struct ifnet *ifp = &sc->sc_if;
-       int country_code, error, i, nrate, srom_major;
+       int country_code, error, i, srom_major;
        u_int32_t reg;
        static const char *type_strings[] = {"Intersil (not supported)",
            "RFMD", "Marvel (not supported)"};
@@ -781,12 +781,7 @@
        ic->ic_caps = IEEE80211_C_PMGT | IEEE80211_C_IBSS |
            IEEE80211_C_HOSTAP | IEEE80211_C_MONITOR;
 
-       nrate = 0;
-       ic->ic_sup_rates[IEEE80211_MODE_11B].rs_rates[nrate++] = 2;
-       ic->ic_sup_rates[IEEE80211_MODE_11B].rs_rates[nrate++] = 4;
-       ic->ic_sup_rates[IEEE80211_MODE_11B].rs_rates[nrate++] = 11;
-       ic->ic_sup_rates[IEEE80211_MODE_11B].rs_rates[nrate++] = 22;
-       ic->ic_sup_rates[IEEE80211_MODE_11B].rs_nrates = nrate;
+       ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b;
 
        /*
         * Call MI attach routines.
diff -r 5a21ab3b99ee -r 114e193b2363 sys/dev/ic/rt2560.c
--- a/sys/dev/ic/rt2560.c       Tue May 01 16:16:05 2018 +0000
+++ b/sys/dev/ic/rt2560.c       Tue May 01 16:18:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rt2560.c,v 1.32 2018/02/08 09:05:19 dholland Exp $     */
+/*     $NetBSD: rt2560.c,v 1.33 2018/05/01 16:18:13 maya Exp $ */
 /*     $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $  */
 /*     $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/
 
@@ -24,7 +24,7 @@
  * http://www.ralinktech.com/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.32 2018/02/08 09:05:19 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.33 2018/05/01 16:18:13 maya Exp $");
 
 
 #include <sys/param.h>
@@ -143,18 +143,6 @@
 static void    rt2560_softintr(void *);
 
 /*
- * Supported rates for 802.11a/b/g modes (in 500Kbps unit).
- */
-static const struct ieee80211_rateset rt2560_rateset_11a =
-       { 8, { 12, 18, 24, 36, 48, 72, 96, 108 } };
-
-static const struct ieee80211_rateset rt2560_rateset_11b =
-       { 4, { 2, 4, 11, 22 } };
-
-static const struct ieee80211_rateset rt2560_rateset_11g =
-       { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
-
-/*
  * Default values for MAC registers; values taken from the reference driver.
  */
 static const struct {
@@ -420,7 +408,7 @@
 
        if (sc->rf_rev == RT2560_RF_5222) {
                /* set supported .11a rates */
-               ic->ic_sup_rates[IEEE80211_MODE_11A] = rt2560_rateset_11a;
+               ic->ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
 
                /* set supported .11a channels */
                for (i = 36; i <= 64; i += 4) {
@@ -441,8 +429,8 @@
        }
 
        /* set supported .11b and .11g rates */
-       ic->ic_sup_rates[IEEE80211_MODE_11B] = rt2560_rateset_11b;
-       ic->ic_sup_rates[IEEE80211_MODE_11G] = rt2560_rateset_11g;
+       ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b;
+       ic->ic_sup_rates[IEEE80211_MODE_11G] = ieee80211_std_rateset_11g;
 
        /* set supported .11b and .11g channels (1 through 14) */
        for (i = 1; i <= 14; i++) {
diff -r 5a21ab3b99ee -r 114e193b2363 sys/dev/ic/rt2661.c
--- a/sys/dev/ic/rt2661.c       Tue May 01 16:16:05 2018 +0000
+++ b/sys/dev/ic/rt2661.c       Tue May 01 16:18:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rt2661.c,v 1.36 2017/10/23 09:31:17 msaitoh Exp $      */
+/*     $NetBSD: rt2661.c,v 1.37 2018/05/01 16:18:13 maya Exp $ */
 /*     $OpenBSD: rt2661.c,v 1.17 2006/05/01 08:41:11 damien Exp $      */
 /*     $FreeBSD: rt2560.c,v 1.5 2006/06/02 19:59:31 csjp Exp $ */
 
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.36 2017/10/23 09:31:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2661.c,v 1.37 2018/05/01 16:18:13 maya Exp $");
 
 
 #include <sys/param.h>
@@ -167,18 +167,6 @@
 static int     rt2661_get_rssi(struct rt2661_softc *, uint8_t);
 static void    rt2661_softintr(void *);
 
-/*
- * Supported rates for 802.11a/b/g modes (in 500Kbps unit).
- */
-static const struct ieee80211_rateset rt2661_rateset_11a =
-       { 8, { 12, 18, 24, 36, 48, 72, 96, 108 } };
-
-static const struct ieee80211_rateset rt2661_rateset_11b =
-       { 4, { 2, 4, 11, 22 } };
-
-static const struct ieee80211_rateset rt2661_rateset_11g =
-       { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
-
 static const struct {
        uint32_t        reg;
        uint32_t        val;
@@ -309,7 +297,7 @@
 
        if (sc->rf_rev == RT2661_RF_5225 || sc->rf_rev == RT2661_RF_5325) {
                /* set supported .11a rates */
-               ic->ic_sup_rates[IEEE80211_MODE_11A] = rt2661_rateset_11a;
+               ic->ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
 
                /* set supported .11a channels */
                for (i = 36; i <= 64; i += 4) {
@@ -330,8 +318,8 @@
        }
 
        /* set supported .11b and .11g rates */
-       ic->ic_sup_rates[IEEE80211_MODE_11B] = rt2661_rateset_11b;
-       ic->ic_sup_rates[IEEE80211_MODE_11G] = rt2661_rateset_11g;
+       ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b;
+       ic->ic_sup_rates[IEEE80211_MODE_11G] = ieee80211_std_rateset_11g;
 
        /* set supported .11b and .11g channels (1 through 14) */
        for (i = 1; i <= 14; i++) {
@@ -2180,7 +2168,7 @@
                 * Find h/w rate index.  We know it exists because the rate
                 * set has already been negotiated.
                 */
-               for (j = 0; rt2661_rateset_11g.rs_rates[j] != RV(rate); j++);
+               for (j = 0; ieee80211_std_rateset_11g.rs_rates[j] != RV(rate); j++);
 
                mask |= 1 << j;
        }
diff -r 5a21ab3b99ee -r 114e193b2363 sys/dev/pci/if_ipw.c
--- a/sys/dev/pci/if_ipw.c      Tue May 01 16:16:05 2018 +0000
+++ b/sys/dev/pci/if_ipw.c      Tue May 01 16:18:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ipw.c,v 1.67 2018/01/16 07:05:24 maxv Exp $ */
+/*     $NetBSD: if_ipw.c,v 1.68 2018/05/01 16:18:13 maya Exp $ */
 /*     FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp         */
 
 /*-
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.67 2018/01/16 07:05:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.68 2018/05/01 16:18:13 maya Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2100 MiniPCI driver
@@ -133,12 +133,6 @@
 static void    ipw_write_mem_1(struct ipw_softc *, bus_size_t, uint8_t *,
     bus_size_t);
 
-/*
- * Supported rates for 802.11b mode (in 500Kbps unit).
- */
-static const struct ieee80211_rateset ipw_rateset_11b =
-       { 4, { 2, 4, 11, 22 } };
-
 static inline uint8_t
 MEM_READ_1(struct ipw_softc *sc, uint32_t addr)
 {
@@ -282,7 +276,7 @@
        ic->ic_myaddr[5] = val & 0xff;
 
        /* set supported .11b rates */
-       ic->ic_sup_rates[IEEE80211_MODE_11B] = ipw_rateset_11b;
+       ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b;
 
        /* set supported .11b channels (read from EEPROM) */
        if ((val = ipw_read_prom_word(sc, IPW_EEPROM_CHANNEL_LIST)) == 0)
diff -r 5a21ab3b99ee -r 114e193b2363 sys/dev/pci/if_iwi.c
--- a/sys/dev/pci/if_iwi.c      Tue May 01 16:16:05 2018 +0000
+++ b/sys/dev/pci/if_iwi.c      Tue May 01 16:18:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iwi.c,v 1.105 2018/01/16 07:05:24 maxv Exp $  */
+/*     $NetBSD: if_iwi.c,v 1.106 2018/05/01 16:18:13 maya Exp $  */
 /*     $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $     */
 
 /*-
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.105 2018/01/16 07:05:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.106 2018/05/01 16:18:13 maya Exp $");
 
 /*-
  * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -147,18 +147,6 @@
 static void    iwi_led_set(struct iwi_softc *, uint32_t, int);
 static void    iwi_sysctlattach(struct iwi_softc *);
 
-/*
- * Supported rates for 802.11a/b/g modes (in 500Kbps unit).
- */
-static const struct ieee80211_rateset iwi_rateset_11a =
-       { 8, { 12, 18, 24, 36, 48, 72, 96, 108 } };
-
-static const struct ieee80211_rateset iwi_rateset_11b =
-       { 4, { 2, 4, 11, 22 } };
-
-static const struct ieee80211_rateset iwi_rateset_11g =
-       { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
-
 static inline uint8_t
 MEM_READ_1(struct iwi_softc *sc, uint32_t addr)
 {
@@ -329,7 +317,7 @@
        if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_PRO_WL_2915ABG_1 ||
            PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_INTEL_PRO_WL_2915ABG_2) {
                /* set supported .11a rates (2915ABG only) */
-               ic->ic_sup_rates[IEEE80211_MODE_11A] = iwi_rateset_11a;
+               ic->ic_sup_rates[IEEE80211_MODE_11A] = ieee80211_std_rateset_11a;
 
                /* set supported .11a channels */
                for (i = 36; i <= 64; i += 4) {
@@ -345,8 +333,8 @@
        }
 
        /* set supported .11b and .11g rates */
-       ic->ic_sup_rates[IEEE80211_MODE_11B] = iwi_rateset_11b;
-       ic->ic_sup_rates[IEEE80211_MODE_11G] = iwi_rateset_11g;
+       ic->ic_sup_rates[IEEE80211_MODE_11B] = ieee80211_std_rateset_11b;
+       ic->ic_sup_rates[IEEE80211_MODE_11G] = ieee80211_std_rateset_11g;
 
        /* set supported .11b and .11g channels (1 through 14) */
        for (i = 1; i <= 14; i++) {
diff -r 5a21ab3b99ee -r 114e193b2363 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Tue May 01 16:16:05 2018 +0000
+++ b/sys/dev/pci/if_iwn.c      Tue May 01 16:18:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iwn.c,v 1.88 2018/01/28 16:12:41 christos Exp $     */
+/*     $NetBSD: if_iwn.c,v 1.89 2018/05/01 16:18:13 maya Exp $ */
 /*     $OpenBSD: if_iwn.c,v 1.135 2014/09/10 07:22:09 dcoppa Exp $     */
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.88 2018/01/28 16:12:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.89 2018/05/01 16:18:13 maya Exp $");
 
 #define IWN_USE_RBUF   /* Use local storage for RX */
 #undef IWN_HWCRYPTO    /* XXX does not even compile yet */
@@ -118,18 +118,6 @@
        PCI_PRODUCT_INTEL_WIFI_LINK_105_2,
 };
 
-/*
- * Supported rates for 802.11a/b/g modes (in 500Kbps unit).
- */
-static const struct ieee80211_rateset iwn_rateset_11a =
-       { 8, { 12, 18, 24, 36, 48, 72, 96, 108 } };
-
-static const struct ieee80211_rateset iwn_rateset_11b =
-       { 4, { 2, 4, 11, 22 } };
-
-static const struct ieee80211_rateset iwn_rateset_11g =
-       { 12, { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 } };
-
 static int     iwn_match(device_t , struct cfdata *, void *);
 static void    iwn_attach(device_t , device_t , void *);
 static int     iwn4965_attach(struct iwn_softc *, pci_product_id_t);
@@ -567,10 +555,10 @@
 #endif /* !IEEE80211_NO_HT */



Home | Main Index | Thread Index | Old Index