From 0463bae558b151201db8e5f09067bdee78b0fc59 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 25 Feb 2022 15:37:50 -0500 Subject: [PATCH] realtekwifi/rtwn: Synchronize with FreeBSD trunk as of today. A few changes ommitted (e.g. NET_EPOCH) as they are not needed. Adds support for a variety of USB devices and one PCI device. --- .../wlan/realtekwifi/dev/rtwn/if_rtwn.c | 2 -- .../realtekwifi/dev/rtwn/if_rtwn_beacon.c | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_calib.c | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_cam.c | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_efuse.c | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_fw.c | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_fw.h | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_ridx.h | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_rx.c | 33 ++++++++----------- .../wlan/realtekwifi/dev/rtwn/if_rtwn_rx.h | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_task.c | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwn_tx.c | 1 - .../wlan/realtekwifi/dev/rtwn/if_rtwnreg.h | 3 -- .../wlan/realtekwifi/dev/rtwn/if_rtwnvar.h | 4 --- .../dev/rtwn/pci/rtwn_pci_attach.c | 15 +++++---- .../dev/rtwn/pci/rtwn_pci_attach.h | 2 +- .../realtekwifi/dev/rtwn/pci/rtwn_pci_reg.c | 1 - .../realtekwifi/dev/rtwn/pci/rtwn_pci_rx.c | 6 +++- .../realtekwifi/dev/rtwn/pci/rtwn_pci_tx.c | 1 - .../realtekwifi/dev/rtwn/pci/rtwn_pci_var.h | 3 +- .../realtekwifi/dev/rtwn/rtl8188e/pci/r88ee.h | 3 -- .../dev/rtwn/rtl8188e/pci/r88ee_reg.h | 1 - .../wlan/realtekwifi/dev/rtwn/rtl8188e/r88e.h | 1 - .../dev/rtwn/rtl8188e/r88e_beacon.c | 1 - .../dev/rtwn/rtl8188e/r88e_calib.c | 1 - .../realtekwifi/dev/rtwn/rtl8188e/r88e_chan.c | 1 - .../realtekwifi/dev/rtwn/rtl8188e/r88e_fw.c | 1 - .../realtekwifi/dev/rtwn/rtl8188e/r88e_init.c | 1 - .../realtekwifi/dev/rtwn/rtl8188e/r88e_led.c | 1 - .../realtekwifi/dev/rtwn/rtl8188e/r88e_priv.h | 1 - .../realtekwifi/dev/rtwn/rtl8188e/r88e_reg.h | 3 -- .../realtekwifi/dev/rtwn/rtl8188e/r88e_rf.c | 1 - .../realtekwifi/dev/rtwn/rtl8188e/r88e_rom.c | 1 - .../realtekwifi/dev/rtwn/rtl8188e/r88e_tx.c | 1 - .../realtekwifi/dev/rtwn/rtl8188e/usb/r88eu.h | 2 -- .../dev/rtwn/rtl8188e/usb/r88eu_attach.c | 1 - .../dev/rtwn/rtl8188e/usb/r88eu_init.c | 1 - .../realtekwifi/dev/rtwn/rtl8192c/pci/r92ce.h | 2 -- .../dev/rtwn/rtl8192c/pci/r92ce_attach.c | 1 - .../dev/rtwn/rtl8192c/pci/r92ce_calib.c | 1 - .../dev/rtwn/rtl8192c/pci/r92ce_fw.c | 1 - .../dev/rtwn/rtl8192c/pci/r92ce_init.c | 1 - .../dev/rtwn/rtl8192c/pci/r92ce_priv.h | 2 -- .../dev/rtwn/rtl8192c/pci/r92ce_reg.h | 1 - .../dev/rtwn/rtl8192c/pci/r92ce_rx.c | 1 - .../dev/rtwn/rtl8192c/pci/r92ce_tx.c | 1 - .../wlan/realtekwifi/dev/rtwn/rtl8192c/r92c.h | 1 - .../dev/rtwn/rtl8192c/r92c_attach.c | 1 - .../dev/rtwn/rtl8192c/r92c_beacon.c | 1 - .../dev/rtwn/rtl8192c/r92c_calib.c | 1 - .../realtekwifi/dev/rtwn/rtl8192c/r92c_chan.c | 1 - .../realtekwifi/dev/rtwn/rtl8192c/r92c_fw.c | 1 - .../realtekwifi/dev/rtwn/rtl8192c/r92c_init.c | 2 +- .../realtekwifi/dev/rtwn/rtl8192c/r92c_priv.h | 3 -- .../realtekwifi/dev/rtwn/rtl8192c/r92c_reg.h | 5 +-- .../realtekwifi/dev/rtwn/rtl8192c/r92c_rf.c | 1 - .../realtekwifi/dev/rtwn/rtl8192c/r92c_rom.c | 1 - .../realtekwifi/dev/rtwn/rtl8192c/r92c_rx.c | 1 - .../realtekwifi/dev/rtwn/rtl8192c/r92c_tx.c | 13 +++++--- .../dev/rtwn/rtl8192c/r92c_tx_desc.h | 1 - .../realtekwifi/dev/rtwn/rtl8192c/usb/r92cu.h | 2 -- .../dev/rtwn/rtl8192c/usb/r92cu_attach.c | 1 - .../dev/rtwn/rtl8192c/usb/r92cu_init.c | 3 +- .../dev/rtwn/rtl8192c/usb/r92cu_led.c | 1 - .../dev/rtwn/rtl8192c/usb/r92cu_priv.h | 3 -- .../dev/rtwn/rtl8192c/usb/r92cu_reg.h | 2 -- .../dev/rtwn/rtl8192c/usb/r92cu_rx.c | 1 - .../dev/rtwn/rtl8192c/usb/r92cu_tx.c | 1 - .../dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h | 2 +- .../wlan/realtekwifi/dev/rtwn/rtl8192e/r92e.h | 1 - .../realtekwifi/dev/rtwn/rtl8192e/r92e_chan.c | 1 - .../realtekwifi/dev/rtwn/rtl8192e/r92e_priv.h | 2 -- .../realtekwifi/dev/rtwn/rtl8192e/usb/r92eu.h | 1 - .../wlan/realtekwifi/dev/rtwn/rtl8812a/r12a.h | 1 - .../dev/rtwn/rtl8812a/r12a_beacon.c | 1 - .../dev/rtwn/rtl8812a/r12a_calib.c | 1 - .../realtekwifi/dev/rtwn/rtl8812a/r12a_caps.c | 1 - .../realtekwifi/dev/rtwn/rtl8812a/r12a_chan.c | 1 - .../realtekwifi/dev/rtwn/rtl8812a/r12a_fw.c | 1 - .../dev/rtwn/rtl8812a/r12a_fw_cmd.h | 1 - .../realtekwifi/dev/rtwn/rtl8812a/r12a_init.c | 1 - .../realtekwifi/dev/rtwn/rtl8812a/r12a_led.c | 1 - .../realtekwifi/dev/rtwn/rtl8812a/r12a_priv.h | 3 -- .../realtekwifi/dev/rtwn/rtl8812a/r12a_reg.h | 3 -- .../realtekwifi/dev/rtwn/rtl8812a/r12a_rf.c | 1 - .../realtekwifi/dev/rtwn/rtl8812a/r12a_rom.c | 1 - .../realtekwifi/dev/rtwn/rtl8812a/r12a_rx.c | 3 +- .../realtekwifi/dev/rtwn/rtl8812a/r12a_tx.c | 4 +-- .../dev/rtwn/rtl8812a/r12a_tx_desc.h | 1 - .../realtekwifi/dev/rtwn/rtl8812a/usb/r12au.h | 1 - .../dev/rtwn/rtl8812a/usb/r12au_attach.c | 1 - .../dev/rtwn/rtl8812a/usb/r12au_init.c | 1 - .../dev/rtwn/rtl8812a/usb/r12au_rx.c | 1 - .../dev/rtwn/rtl8812a/usb/r12au_tx.c | 1 - .../wlan/realtekwifi/dev/rtwn/rtl8821a/r21a.h | 1 - .../dev/rtwn/rtl8821a/r21a_beacon.c | 1 - .../dev/rtwn/rtl8821a/r21a_calib.c | 1 - .../realtekwifi/dev/rtwn/rtl8821a/r21a_chan.c | 1 - .../realtekwifi/dev/rtwn/rtl8821a/r21a_fw.c | 1 - .../realtekwifi/dev/rtwn/rtl8821a/r21a_init.c | 1 - .../realtekwifi/dev/rtwn/rtl8821a/r21a_led.c | 1 - .../realtekwifi/dev/rtwn/rtl8821a/r21a_priv.h | 3 -- .../realtekwifi/dev/rtwn/rtl8821a/r21a_reg.h | 1 - .../realtekwifi/dev/rtwn/rtl8821a/r21a_rom.c | 1 - .../realtekwifi/dev/rtwn/rtl8821a/r21a_rx.c | 1 - .../realtekwifi/dev/rtwn/rtl8821a/usb/r21au.h | 1 - .../dev/rtwn/rtl8821a/usb/r21au_attach.c | 1 - .../dev/rtwn/rtl8821a/usb/r21au_dfs.c | 1 - .../dev/rtwn/rtl8821a/usb/r21au_init.c | 2 -- .../dev/rtwn/usb/rtwn_usb_attach.c | 1 - .../dev/rtwn/usb/rtwn_usb_attach.h | 18 ++++++++-- .../realtekwifi/dev/rtwn/usb/rtwn_usb_ep.c | 1 - .../realtekwifi/dev/rtwn/usb/rtwn_usb_reg.c | 7 ++-- .../realtekwifi/dev/rtwn/usb/rtwn_usb_tx.c | 2 -- 114 files changed, 64 insertions(+), 180 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn.c index 499ae4ebcd..ae29ad7003 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn.c @@ -79,7 +79,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_radiotap_attach(struct rtwn_softc *); static void rtwn_vap_decrement_counters(struct rtwn_softc *, enum ieee80211_opmode, int); @@ -1541,7 +1540,6 @@ rtwn_getradiocaps(struct ieee80211com *ic, setbit(bands, IEEE80211_MODE_11A); setbit(bands, IEEE80211_MODE_11NA); for (i = 0; i < nitems(sc->chan_num_5ghz); i++) { - if (sc->chan_num_5ghz[i] == 0) continue; diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_beacon.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_beacon.c index 99a1ad80ff..63eb7a0073 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_beacon.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_beacon.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_reset_beacon_valid(struct rtwn_softc *sc, int id) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_calib.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_calib.c index 5c3ed7e649..7eb7c5c021 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_calib.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_calib.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void rtwn_temp_calib(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_cam.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_cam.c index 539fb411f7..6ee6305336 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_cam.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_cam.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include - void rtwn_init_cam(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_efuse.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_efuse.c index b14f97377d..b2ec82e379 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_efuse.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_efuse.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include - static int rtwn_efuse_switch_power(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_fw.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_fw.c index 5cc71d2b80..75ff59dd13 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_fw.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_fw.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include - #ifndef RTWN_WITHOUT_UCODE static int rtwn_fw_loadpage(struct rtwn_softc *sc, int page, const uint8_t *buf, diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_fw.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_fw.h index 41e84ee82f..50d2aa31b1 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_fw.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_fw.h @@ -53,7 +53,6 @@ struct r92c_fw_hdr { uint32_t reserved5; } __packed; - int rtwn_load_firmware(struct rtwn_softc *); #endif /* IF_RTWN_FW_H */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_ridx.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_ridx.h index 2e6f8d9845..902c470d25 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_ridx.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_ridx.h @@ -47,7 +47,6 @@ #define RTWN_RATE_IS_OFDM(rate) \ ((rate) >= RTWN_RIDX_OFDM6 && (rate) != RTWN_RIDX_UNKNOWN) - static const uint8_t ridx2rate[] = { 2, 4, 11, 22, 12, 18, 24, 36, 48, 72, 96, 108 }; diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_rx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_rx.c index 04062e0d12..cc7d961515 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_rx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_rx.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include - void rtwn_get_rates(struct rtwn_softc *sc, const struct ieee80211_rateset *rs, const struct ieee80211_htrateset *rs_ht, uint32_t *rates_p, @@ -366,6 +365,18 @@ rtwn_get_multi_pos(const uint8_t maddr[]) return (pos); } +static u_int +rtwm_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) +{ + uint32_t *mfilt = arg; + uint8_t pos; + + pos = rtwn_get_multi_pos(LLADDR(sdl)); + mfilt[pos / 32] |= (1 << (pos % 32)); + + return (1); +} + void rtwn_set_multi(struct rtwn_softc *sc) { @@ -377,32 +388,16 @@ rtwn_set_multi(struct rtwn_softc *sc) /* general structure was copied from ath(4). */ if (ic->ic_allmulti == 0) { struct ieee80211vap *vap; - struct ifnet *ifp; - struct ifmultiaddr *ifma; /* * Merge multicast addresses to form the hardware filter. */ mfilt[0] = mfilt[1] = 0; - TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { - ifp = vap->iv_ifp; - if_maddr_rlock(ifp); - TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { - caddr_t dl; - uint8_t pos; - - dl = LLADDR((struct sockaddr_dl *) - ifma->ifma_addr); - pos = rtwn_get_multi_pos(dl); - - mfilt[pos / 32] |= (1 << (pos % 32)); - } - if_maddr_runlock(ifp); - } + TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) + if_foreach_llmaddr(vap->iv_ifp, rtwm_hash_maddr, mfilt); } else mfilt[0] = mfilt[1] = ~0; - rtwn_write_4(sc, R92C_MAR + 0, mfilt[0]); rtwn_write_4(sc, R92C_MAR + 4, mfilt[1]); diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_rx.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_rx.h index 49897eb956..ecfe2e0abd 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_rx.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_rx.h @@ -21,7 +21,6 @@ #define RTWN_NOISE_FLOOR -95 - void rtwn_get_rates(struct rtwn_softc *, const struct ieee80211_rateset *, const struct ieee80211_htrateset *, uint32_t *, int *, int); void rtwn_set_basicrates(struct rtwn_softc *, uint32_t); diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_task.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_task.c index 87f695f102..89822cf2a2 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_task.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_task.c @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include - static void rtwn_cmdq_cb(void *arg, int pending) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_tx.c index 69ce3ae7c4..32bdd1b6b3 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwn_tx.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - void rtwn_drain_mbufq(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwnreg.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwnreg.h index 00903d884b..b1eac291c4 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwnreg.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwnreg.h @@ -26,7 +26,6 @@ #define R92C_H2C_NBOX 4 - /* Common part of Tx descriptor (named only!). */ struct rtwn_tx_desc_common { uint16_t pktlen; @@ -115,7 +114,6 @@ struct rtwn_rx_stat_pci { #define RW(var, field, val) \ (((var) & ~field##_M) | SM(field, val)) - #define RTWN_MAX_CONDITIONS 3 /* @@ -155,7 +153,6 @@ struct rtwn_rf_prog { const struct rtwn_rf_prog *next; }; - /* XXX move to net80211. */ static __inline int rtwn_chan2centieee(const struct ieee80211_channel *c) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwnvar.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwnvar.h index fe31aa5447..b63d4ddf29 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwnvar.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/if_rtwnvar.h @@ -80,7 +80,6 @@ struct rtwn_tx_phystat { uint32_t phydw[RTWN_PHY_STATUS_SIZE / sizeof(uint32_t)]; }; - struct rtwn_softc; union sec_param { @@ -423,7 +422,6 @@ MALLOC_DECLARE(M_RTWN_PRIV); #define RTWN_NT_LOCK_INITIALIZED(sc) mtx_initialized(&(sc)->nt_mtx) #define RTWN_NT_LOCK_DESTROY(sc) mtx_destroy(&(sc)->nt_mtx) - void rtwn_sysctlattach(struct rtwn_softc *); int rtwn_attach(struct rtwn_softc *); @@ -431,7 +429,6 @@ void rtwn_detach(struct rtwn_softc *); void rtwn_resume(struct rtwn_softc *); void rtwn_suspend(struct rtwn_softc *); - /* Interface-specific. */ #define rtwn_write_1(_sc, _addr, _val) \ (((_sc)->sc_write_1)((_sc), (_addr), (_val))) @@ -591,7 +588,6 @@ void rtwn_suspend(struct rtwn_softc *); #define rtwn_init_bcnq1_boundary(_sc) \ (((_sc)->sc_init_bcnq1_boundary)((_sc))) - /* * Methods to access subfields in registers. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_attach.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_attach.c index 392279cb71..efa6bc0150 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_attach.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_attach.c @@ -63,7 +63,6 @@ __FBSDID("$FreeBSD$"); #include - static device_probe_t rtwn_pci_probe; static device_attach_t rtwn_pci_attach; static device_detach_t rtwn_pci_detach; @@ -92,19 +91,19 @@ static void rtwn_pci_beacon_update_end(struct rtwn_softc *, struct ieee80211vap *); static void rtwn_pci_attach_methods(struct rtwn_softc *); - static const struct rtwn_pci_ident * rtwn_pci_probe_sub(device_t dev) { - const struct rtwn_pci_ident *ident; - int vendor_id, device_id; + int i, vendor_id, device_id; vendor_id = pci_get_vendor(dev); device_id = pci_get_device(dev); - for (ident = rtwn_pci_ident_table; ident->name != NULL; ident++) - if (vendor_id == ident->vendor && device_id == ident->device) - return (ident); + for (i = 0; i < nitems(rtwn_pci_ident_table); i++) { + if (vendor_id == rtwn_pci_ident_table[i].vendor && + device_id == rtwn_pci_ident_table[i].device) + return (&rtwn_pci_ident_table[i]); + } return (NULL); } @@ -788,6 +787,8 @@ static devclass_t rtwn_pci_devclass; DRIVER_MODULE(rtwn_pci, pci, rtwn_pci_driver, rtwn_pci_devclass, NULL, NULL); MODULE_VERSION(rtwn_pci, 1); +MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, rtwn, rtwn_pci_ident_table, + nitems(rtwn_pci_ident_table)); MODULE_DEPEND(rtwn_pci, pci, 1, 1, 1); MODULE_DEPEND(rtwn_pci, wlan, 1, 1, 1); MODULE_DEPEND(rtwn_pci, rtwn, 2, 2, 2); diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_attach.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_attach.h index 389d52fff9..b37ef67252 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_attach.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_attach.h @@ -35,7 +35,7 @@ struct rtwn_pci_ident { static const struct rtwn_pci_ident rtwn_pci_ident_table[] = { { 0x10ec, 0x8176, "Realtek RTL8188CE", RTWN_CHIP_RTL8192CE }, { 0x10ec, 0x8179, "Realtek RTL8188EE", RTWN_CHIP_RTL8188EE }, - { 0, 0, NULL, RTWN_CHIP_MAX_PCI } + { 0x10ec, 0x8178, "Realtek RTL8192CE", RTWN_CHIP_RTL8192CE }, }; typedef void (*chip_pci_attach)(struct rtwn_pci_softc *); diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_reg.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_reg.c index 6fe188c3f7..0ee417acbd 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_reg.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_reg.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - int rtwn_pci_write_1(struct rtwn_softc *sc, uint16_t addr, uint8_t val) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_rx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_rx.c index a87a6b2ba6..6ecfbb4617 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_rx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_rx.c @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -56,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - void rtwn_pci_dma_map_addr(void *arg, bus_dma_segment_t *segs, int nsegs, int error) @@ -85,6 +85,7 @@ rtwn_pci_setup_rx_desc(struct rtwn_pci_softc *pc, static void rtwn_pci_rx_frame(struct rtwn_pci_softc *pc) { + struct epoch_tracker et; struct rtwn_softc *sc = &pc->pc_sc; struct rtwn_rx_ring *ring = &pc->rx_ring; struct rtwn_rx_stat_pci *rx_desc = &ring->desc[ring->cur]; @@ -164,12 +165,15 @@ rtwn_pci_rx_frame(struct rtwn_pci_softc *pc) /* Send the frame to the 802.11 layer. */ RTWN_UNLOCK(sc); + + NET_EPOCH_ENTER(et); if (ni != NULL) { (void)ieee80211_input_mimo(ni, m); /* Node is no longer needed. */ ieee80211_free_node(ni); } else (void)ieee80211_input_mimo_all(ic, m); + NET_EPOCH_EXIT(et); RTWN_LOCK(sc); diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_tx.c index 434e0488a9..6dd84f3672 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_tx.c @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include - static struct mbuf * rtwn_mbuf_defrag(struct mbuf *m0, int how) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_var.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_var.h index e22be949ba..eb71fe453f 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_var.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/pci/rtwn_pci_var.h @@ -16,7 +16,7 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * + * * $FreeBSD$ */ @@ -101,7 +101,6 @@ enum { (RTWN_PCI_INTR_RX_ERROR | RTWN_PCI_INTR_RX_OVERFLOW | \ RTWN_PCI_INTR_RX_DESC_UNAVAIL | RTWN_PCI_INTR_RX_DONE) - struct rtwn_pci_softc { struct rtwn_softc pc_sc; /* must be the first */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/pci/r88ee.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/pci/r88ee.h index e011dc1edf..319d9c6995 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/pci/r88ee.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/pci/r88ee.h @@ -21,7 +21,6 @@ #include - /* * Global definitions. */ @@ -33,7 +32,6 @@ (R88EE_PUBQ_NPAGES + R88EE_HPQ_NPAGES + \ R88EE_NPQ_NPAGES + R88EE_LPQ_NPAGES) - /* * Function declarations. */ @@ -50,4 +48,3 @@ void r88ee_start_xfers(struct rtwn_softc *); void r88ee_post_init(struct rtwn_softc *); #endif /* RTL8188EE_H */ - diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/pci/r88ee_reg.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/pci/r88ee_reg.h index 96fbe888ac..a6c743c677 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/pci/r88ee_reg.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/pci/r88ee_reg.h @@ -23,4 +23,3 @@ #include #endif /* R88EE_REG_H */ - diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e.h index ce9fa19a87..b6cd6053d0 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e.h @@ -33,7 +33,6 @@ #define R88E_CALIB_THRESHOLD 4 - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_beacon.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_beacon.c index 4c29d37fab..affc768ae0 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_beacon.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_beacon.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_beacon_enable(struct rtwn_softc *sc, int id, int enable) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_calib.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_calib.c index 4d0dffa939..b4de113894 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_calib.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_calib.c @@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r88e_iq_cal_reg_vals { uint32_t adda[16]; diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_chan.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_chan.c index 7e33fe8877..be2271c6f5 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_chan.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_chan.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r88e_get_power_group(struct rtwn_softc *sc, struct ieee80211_channel *c) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_fw.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_fw.c index dbce406b8b..ea74252fcc 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_fw.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_fw.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE int r88e_fw_cmd(struct rtwn_softc *sc, uint8_t id, const void *buf, int len) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_init.c index 99796c5f07..8c13057e03 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_init.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r88e_crystalcap_write(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_led.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_led.c index 2bbcdb15ca..3c93a2b789 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_led.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_led.c @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_set_led(struct rtwn_softc *sc, int led, int on) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_priv.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_priv.h index 8ec5502d84..81d82c71d7 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_priv.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_priv.h @@ -33,7 +33,6 @@ struct rtwn_r88e_txpwr { int8_t bw20_tx_pwr_diff; }; - /* * MAC initialization values. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_reg.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_reg.h index 94b9a66053..d578373f75 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_reg.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_reg.h @@ -44,7 +44,6 @@ #define R88E_TX_RPT_TIME 0x4f0 #define R88E_SCH_TXCMD 0x5f8 - /* Bits for R88E_HIMR. */ #define R88E_HIMR_ROK 0x00000001 /* receive DMA OK */ #define R88E_HIMR_RDU 0x00000002 /* Rx descriptor unavailable */ @@ -100,7 +99,6 @@ /* Bits for R92C_SECCFG. */ #define R88E_SECCFG_CHK_KEYID 0x0100 - /* * Baseband registers. */ @@ -108,7 +106,6 @@ #define R88E_LSSI_PARAM_ADDR_M 0x0ff00000 #define R88E_LSSI_PARAM_ADDR_S 20 - /* * RF (6052) registers. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_rf.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_rf.c index a836f138ae..e5966a4cc0 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_rf.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_rf.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_rf_write(struct rtwn_softc *sc, int chain, uint8_t addr, uint32_t val) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_rom.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_rom.c index f1baf5ffc5..d84d1b8149 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_rom.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_rom.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_parse_rom(struct rtwn_softc *sc, uint8_t *buf) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_tx.c index dd3aaecefa..d9920f73e3 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/r88e_tx.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88e_tx_enable_ampdu(void *buf, int enable) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu.h index e79b1387c4..9b9198e0a8 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu.h @@ -23,14 +23,12 @@ #include - /* * Global definitions. */ #define R88EU_PUBQ_NPAGES 142 #define R88EU_TX_PAGE_COUNT 169 - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu_attach.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu_attach.c index 1ae0fc24c1..a264629a60 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu_attach.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu_attach.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include - static struct rtwn_r88e_txpwr r88e_txpwr; void r88eu_attach(struct rtwn_usb_softc *); diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu_init.c index 1fcecbd4d9..156f6ea79c 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8188e/usb/r88eu_init.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r88eu_init_bb(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce.h index 5d13f1608d..39e08b4afb 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce.h @@ -25,7 +25,6 @@ #include - /* * Global definitions. */ @@ -35,7 +34,6 @@ #define R92CE_TX_PAGE_COUNT \ (R92CE_PUBQ_NPAGES + R92CE_HPQ_NPAGES + R92CE_LPQ_NPAGES) - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_attach.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_attach.c index bff91b7433..d3f6537419 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_attach.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_attach.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct rtwn_r92c_txpwr r92c_txpwr; void r92ce_attach(struct rtwn_pci_softc *); diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_calib.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_calib.c index aebf60ae62..f4e68e12af 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_calib.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_calib.c @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r92ce_iq_cal_reg_vals { uint32_t adda[16]; diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_fw.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_fw.c index b28104463b..b28f80ce08 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_fw.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_fw.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include - #ifndef RTWN_WITHOUT_UCODE void r92ce_fw_reset(struct rtwn_softc *sc, int reason) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_init.c index 5b7f9a0e19..7b07f6cfc5 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_init.c @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92ce_init_intr(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_priv.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_priv.h index 7416516cd9..08172a607f 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_priv.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_priv.h @@ -25,7 +25,6 @@ #include - /* * MAC initialization values. */ @@ -53,7 +52,6 @@ static const struct rtwn_mac_prog rtl8192ce_mac[] = { { 0x70b, 0x87 } }; - /* * Baseband initialization values. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_reg.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_reg.h index 355d8f4622..d76cc64e2c 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_reg.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_reg.h @@ -51,7 +51,6 @@ #define R92C_UART_TX_DES 0x370 #define R92C_UART_RX_DES 0x378 - /* Bits for R92C_GPIO_MUXCFG. */ #define R92C_GPIO_MUXCFG_RFKILL 0x0008 diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_rx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_rx.c index d8b3c5e0b5..7cd6283ea1 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_rx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_rx.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92ce_get_intr_status(struct rtwn_pci_softc *pc, int *rings) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_tx.c index 19de15b5a6..ea6535f46b 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/pci/r92ce_tx.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92ce_setup_tx_desc(struct rtwn_pci_softc *pc, void *desc, uint32_t next_desc_addr) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c.h index f215e34fd8..4d4307c786 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c.h @@ -35,7 +35,6 @@ #define R92C_CALIB_THRESHOLD 2 - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_attach.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_attach.c index a0df8ec768..d71a595dc6 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_attach.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_attach.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92c_detach_private(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_beacon.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_beacon.c index 15af77a06f..477358bbf9 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_beacon.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_beacon.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92c_beacon_init(struct rtwn_softc *sc, void *buf, int id) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_calib.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_calib.c index 7a2e998c1b..c340c816c7 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_calib.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_calib.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - /* Registers to save and restore during IQ calibration. */ struct r92c_iq_cal_reg_vals { uint32_t adda[16]; diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_chan.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_chan.c index 94a1284fed..01e0cfb629 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_chan.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_chan.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r92c_get_power_group(struct rtwn_softc *sc, struct ieee80211_channel *c) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_fw.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_fw.c index 0791990a0c..7ad6d7d2df 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_fw.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_fw.c @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE static int r92c_fw_cmd(struct rtwn_softc *sc, uint8_t id, const void *buf, int len) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_init.c index 7a4d3f12a5..4e29fe0b03 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_init.c @@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92c_check_condition(struct rtwn_softc *sc, const uint8_t cond[]) { @@ -322,6 +321,7 @@ r92c_init_antsel(struct rtwn_softc *sc) rtwn_bb_setbits(sc, R92C_FPGA0_RFPARAM(0), 0, 0x2000); reg = rtwn_bb_read(sc, R92C_FPGA0_RFIFACEOE(0)); sc->sc_ant = MS(reg, R92C_FPGA0_RFIFACEOE0_ANT); /* XXX */ + rtwn_setbits_1(sc, R92C_LEDCFG2, 0x80, 0); } void diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_priv.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_priv.h index 80f0582849..645f07a587 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_priv.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_priv.h @@ -36,7 +36,6 @@ struct rtwn_r92c_txpwr { int8_t ht20_max_pwr[R92C_MAX_CHAINS][R92C_GROUP_2G]; }; - /* * Baseband initialization values (shared parts). */ @@ -132,7 +131,6 @@ static const struct rtwn_agc_prog rtl8192ce_agc[] = { } }; - /* * RF initialization values. */ @@ -331,7 +329,6 @@ static const struct rtwn_rf_prog rtl8192c_rf[] = { { 0, NULL, NULL, { 0 }, NULL } }; - struct rtwn_r92c_txagc { uint8_t pwr[R92C_GROUP_2G][28]; /* RTWN_RIDX_HT_MCS(15) + 1 */ }; diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_reg.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_reg.h index 2c494b49f5..d01168fe39 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_reg.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_reg.h @@ -148,6 +148,7 @@ #define R92C_RD_RESP_PKT_TH 0x463 #define R92C_INIRTS_RATE_SEL 0x480 #define R92C_INIDATA_RATE_SEL(macid) (0x484 + (macid)) +#define R92C_POWER_STATUS 0x4a4 #define R92C_QUEUE_CTRL 0x4c6 #define R92C_MAX_AGGR_NUM 0x4ca #define R92C_BAR_MODE_CTRL 0x4cc @@ -223,7 +224,6 @@ #define R92C_MACID1 0x700 #define R92C_BSSID1 0x708 - #define R92C_MACID(id) ((id) == 0 ? R92C_MACID0 : R92C_MACID1) #define R92C_BSSID(id) ((id) == 0 ? R92C_BSSID0 : R92C_BSSID1) @@ -627,7 +627,6 @@ #define R92C_CAMCMD_CLR 0x40000000 #define R92C_CAMCMD_POLLING 0x80000000 - /* * CAM entries. */ @@ -665,7 +664,6 @@ #define R92C_RXFLTMAP_SUBTYPE(subtype) \ (1 << ((subtype) >> IEEE80211_FC0_SUBTYPE_SHIFT)) - /* * Baseband registers. */ @@ -849,7 +847,6 @@ #define R92C_POWER_IQK_RESULT_S 16 #define R92C_POWER_IQK_RESULT_M 0x03ff0000 - /* * RF (6052) registers. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rf.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rf.c index f36f035f2a..c547a06ea9 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rf.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rf.c @@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$"); #include #include - uint32_t r92c_rf_read(struct rtwn_softc *sc, int chain, uint8_t addr) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rom.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rom.c index 0a85c817b2..ea3f3a253d 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rom.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rom.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r92c_set_chains(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rx.c index 24759d1bb0..258b914d44 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_rx.c @@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r92c_classify_intr(struct rtwn_softc *sc, void *buf, int len) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_tx.c index f110b61c23..b01731ba29 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_tx.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r92c_tx_get_sco(struct rtwn_softc *sc, struct ieee80211_channel *c) { @@ -103,7 +102,7 @@ r92c_tx_protection(struct rtwn_softc *sc, struct r92c_tx_desc *txd, rate = rtwn_ctl_mcsrate(ic->ic_rt, ridx); else rate = ieee80211_ctl_rate(ic->ic_rt, ridx2rate[ridx]); - ridx = rate2ridx(rate); + ridx = rate2ridx(IEEE80211_RV(rate)); txd->txdw4 |= htole32(SM(R92C_TXDW4_RTSRATE, ridx)); /* RTS rate fallback limit (max). */ @@ -211,6 +210,12 @@ r92c_tx_setup_macid(void *buf, int id) struct r92c_tx_desc *txd = (struct r92c_tx_desc *)buf; txd->txdw1 |= htole32(SM(R92C_TXDW1_MACID, id)); + + /* XXX does not belong here */ + /* XXX temporary (I hope) */ + /* Force CCK1 for RTS / CTS frames (driver bug) */ + txd->txdw4 &= ~htole32(SM(R92C_TXDW4_RTSRATE, R92C_TXDW4_RTSRATE_M)); + txd->txdw4 &= ~htole32(R92C_TXDW4_RTS_SHORT); } void @@ -250,7 +255,6 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, txd->flags0 |= R92C_FLAGS0_BMCAST; if (!ismcast) { - struct rtwn_node *un = RTWN_NODE(ni); /* Unicast frame, check if an ACK is expected. */ if (!qos || (qos & IEEE80211_QOS_ACKPOLICY) != IEEE80211_QOS_ACKPOLICY_NOACK) { @@ -259,6 +263,7 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, maxretry)); } + struct rtwn_node *un = RTWN_NODE(ni); macid = un->id; if (type == IEEE80211_FC0_TYPE_DATA) { @@ -330,7 +335,7 @@ r92c_fill_tx_desc(struct rtwn_softc *sc, struct ieee80211_node *ni, uint16_t seqno; if (m->m_flags & M_AMPDU_MPDU) { - seqno = ni->ni_txseqs[tid]; + seqno = ni->ni_txseqs[tid] % IEEE80211_SEQ_RANGE; ni->ni_txseqs[tid]++; } else seqno = M_SEQNO_GET(m) % IEEE80211_SEQ_RANGE; diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_tx_desc.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_tx_desc.h index c3bc87caa3..c65ece0e3c 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_tx_desc.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/r92c_tx_desc.h @@ -109,7 +109,6 @@ struct r92c_tx_desc { #define R92C_TXDW6_MAX_AGG_S 11 } __packed __attribute__((aligned(4))); - /* Rate adaptation modes. */ #define R92C_RAID_11BGN 0 #define R92C_RAID_11GN 1 diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu.h index 4cc010494a..f9b9861867 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu.h @@ -23,14 +23,12 @@ #include - /* * Global definitions. */ #define R92CU_PUBQ_NPAGES 231 #define R92CU_TX_PAGE_COUNT 248 - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_attach.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_attach.c index 4a7698410c..ef436ee3ed 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_attach.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_attach.c @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - static struct rtwn_r92c_txpwr r92c_txpwr; void r92cu_attach(struct rtwn_usb_softc *); diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_init.c index fc39cee28e..94563fed63 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_init.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92cu_init_bb(struct rtwn_softc *sc) { @@ -357,6 +356,8 @@ void r92cu_post_init(struct rtwn_softc *sc) { + rtwn_write_4(sc, R92C_POWER_STATUS, 0x5); + /* Perform LO and IQ calibrations. */ r92c_iq_calib(sc); /* Perform LC calibration. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_led.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_led.c index 7243209466..534987b6a1 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_led.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_led.c @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include - void r92cu_set_led(struct rtwn_softc *sc, int led, int on) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_priv.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_priv.h index 8e3203f082..a7f9e8d495 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_priv.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_priv.h @@ -23,7 +23,6 @@ #include - /* * MAC initialization values. */ @@ -52,7 +51,6 @@ static const struct rtwn_mac_prog rtl8192cu_mac[] = { { 0x70a, 0x65 }, { 0x70b, 0x87 } }; - /* * Baseband initialization values. */ @@ -274,7 +272,6 @@ static const struct rtwn_bb_prog rtl8192cu_bb[] = { } }; - static const uint32_t rtl8188ru_agc_vals[] = { 0x7b000001, 0x7b010001, 0x7b020001, 0x7b030001, 0x7b040001, 0x7b050001, 0x7b060001, 0x7b070001, 0x7b080001, 0x7a090001, diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_reg.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_reg.h index a9db29ccbc..f8ab133f53 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_reg.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_reg.h @@ -23,14 +23,12 @@ #include - /* * MAC registers. */ /* System Configuration. */ #define R92C_USB_SIE_INTF 0x0e0 - /* * USB registers. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_rx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_rx.c index fcd760b613..6710b1a8fa 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_rx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_rx.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); #include - int r92cu_align_rx(int totlen, int len) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_tx.c index 04dbade065..a9e37ba819 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_tx.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r92cu_dump_tx_desc(struct rtwn_softc *sc, const void *desc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h index 16c2d0587e..f160f13109 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h @@ -42,4 +42,4 @@ struct r92cu_tx_desc { uint16_t pad; } __packed __attribute__((aligned(4))); -#endif /* R92CU_TX_DESC_H */ \ No newline at end of file +#endif /* R92CU_TX_DESC_H */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e.h index a961236c06..c4a6033025 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e.h @@ -40,7 +40,6 @@ #define R92E_MAX_FW_SIZE 0x8000 - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e_chan.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e_chan.c index 7b3c5630dd..0211e28838 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e_chan.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e_chan.c @@ -127,7 +127,6 @@ r92e_get_txpower(struct rtwn_softc *sc, int chain, struct ieee80211_channel *c, min_mcs = RTWN_RIDX_HT_MCS(i * 8); for (ridx = min_mcs; ridx <= max_mcs; ridx++) power[ridx] += pwr_diff; - } /* Apply max limit. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e_priv.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e_priv.h index 1bcae4f9aa..ddf8c48ca4 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e_priv.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/r92e_priv.h @@ -61,7 +61,6 @@ static const struct rtwn_mac_prog rtl8192eu_mac[] = { { 0x70b, 0x87 } }; - /* * Baseband initialization values. */ @@ -147,7 +146,6 @@ static const struct rtwn_bb_prog rtl8192eu_bb[] = { } }; - static const uint32_t rtl8192eu_agc_vals[] = { 0xfb000001, 0xfb010001, 0xfb020001, 0xfb030001, 0xfb040001, 0xfb050001, 0xfa060001, 0xf9070001, 0xf8080001, 0xf7090001, diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/usb/r92eu.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/usb/r92eu.h index a59ceb63be..3ca6e06758 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/usb/r92eu.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8192e/usb/r92eu.h @@ -26,7 +26,6 @@ * $FreeBSD$ */ - #ifndef RTL8192EU_H #define RTL8192EU_H diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a.h index e8de45aa9d..f3bbdf7736 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a.h @@ -52,7 +52,6 @@ static const uint8_t r12a_chan_5ghz_1[] = static const uint8_t r12a_chan_5ghz_2[] = { 149, 153, 157, 161, 165, 169, 173, 177 }; - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_beacon.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_beacon.c index 7a3335e84f..879d513eb6 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_beacon.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_beacon.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12a_beacon_init(struct rtwn_softc *sc, void *buf, int id) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_calib.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_calib.c index c87151b535..268e06b5ba 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_calib.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_calib.c @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12a_lc_calib(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_caps.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_caps.c index aa1c755cb1..ab175b41ec 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_caps.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_caps.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r12a_ioctl_net(struct ieee80211com *ic, u_long cmd, void *data) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_chan.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_chan.c index 9536c6db4a..a1b39b97c6 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_chan.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_chan.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r12a_write_txpower(struct rtwn_softc *sc, int chain, struct ieee80211_channel *c, uint8_t power[RTWN_RIDX_COUNT]) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_fw.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_fw.c index f7b88e42c4..08847d7fff 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_fw.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_fw.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE void r12a_fw_reset(struct rtwn_softc *sc, int reason) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_fw_cmd.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_fw_cmd.h index 58b82ed142..e50e918912 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_fw_cmd.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_fw_cmd.h @@ -77,7 +77,6 @@ struct r12a_fw_cmd_iq_calib { #define RTWN_CMD_IQ_EXT_LNA_5G(lna) ((lna) << 1) } __packed; - /* * C2H event types. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_init.c index 8ec401d9d0..af1a746b75 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_init.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r12a_check_condition(struct rtwn_softc *sc, const uint8_t cond[]) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_led.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_led.c index aa67c67b97..c2b76d1abd 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_led.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_led.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12a_set_led(struct rtwn_softc *sc, int led, int on) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_priv.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_priv.h index e75e32fcf9..f770e3b0ac 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_priv.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_priv.h @@ -73,7 +73,6 @@ static const struct rtwn_mac_prog rtl8812au_mac_no_ext_pa_lna[] = { RTL8812AU_MAC_PROG_END }; - /* * Baseband initialization values. */ @@ -212,7 +211,6 @@ static const struct rtwn_bb_prog rtl8812au_bb[] = { } }; - static const uint32_t rtl8812au_agc_vals0_lna_g0[] = { 0xfc000001, 0xfb020001, 0xfa040001, 0xf9060001, 0xf8080001, 0xf70a0001, 0xf60c0001, 0xf50e0001, 0xf4100001, 0xf3120001, @@ -832,7 +830,6 @@ static const struct rtwn_rf_prog rtl8812au_rf[] = { { 0, NULL, NULL, { 0 }, NULL } }; - /* * Registers to save before IQ calibration. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_reg.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_reg.h index 581e707813..b6aa302e69 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_reg.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_reg.h @@ -50,7 +50,6 @@ #define R12A_ARFR_2G(i) (0x48c + (i) * 8) #define R12A_HT_SINGLE_AMPDU 0x4c7 - /* Bits for R92C_MAC_PHY_CTRL. */ #define R12A_MAC_PHY_CRYSTALCAP_M 0x7ff80000 #define R12A_MAC_PHY_CRYSTALCAP_S 19 @@ -89,7 +88,6 @@ #define R12A_RCR_TCP_OFFLD_EN 0x02000000 #define R12A_RCR_VHT_ACK 0x04000000 - /* * Baseband registers. */ @@ -234,7 +232,6 @@ #define R12A_TXAGC_MCS15_M 0xff000000 #define R12A_TXAGC_MCS15_S 24 - /* * RF (6052) registers. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rf.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rf.c index 43bd7b9ae6..a9936a1209 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rf.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rf.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - uint32_t r12a_rf_read(struct rtwn_softc *sc, int chain, uint8_t addr) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rom.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rom.c index f5d16a3ff7..9eaa03adf3 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rom.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rom.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12a_parse_rom_common(struct rtwn_softc *sc, uint8_t *buf) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rx.c index 9fb4105317..98e0cabdff 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_rx.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE void r12a_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) @@ -322,8 +321,10 @@ r12a_get_rx_stats(struct rtwn_softc *sc, struct ieee80211_rx_stats *rxs, */ #if 0 rxs->r_flags |= IEEE80211_R_IEEE | IEEE80211_R_FREQ; + rxs->r_flags |= IEEE80211_R_BAND; rxs->c_ieee = MS(le16toh(physt->phyw1), R12A_PHYW1_CHAN); rxs->c_freq = ieee80211_ieee2mhz(rxs->c_ieee, (rxs->c_ieee < 36) ? IEEE80211_CHAN_2GHZ : IEEE80211_CHAN_5GHZ); + rxs->c_band = (rxs->c_ieee < 36) ? IEEE80211_CHAN_2GHZ : IEEE80211_CHAN_5GHZ; #endif } diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_tx.c index 3f6888c07f..3ce171c824 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_tx.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include - static int r12a_get_primary_channel(struct rtwn_softc *sc, struct ieee80211_channel *c) { @@ -111,7 +110,7 @@ r12a_tx_protection(struct rtwn_softc *sc, struct r12a_tx_desc *txd, rate = rtwn_ctl_mcsrate(ic->ic_rt, ridx); else rate = ieee80211_ctl_rate(ic->ic_rt, ridx2rate[ridx]); - ridx = rate2ridx(rate); + ridx = rate2ridx(IEEE80211_RV(rate)); txd->txdw4 |= htole32(SM(R12A_TXDW4_RTSRATE, ridx)); /* RTS rate fallback limit (max). */ @@ -424,7 +423,6 @@ r12a_fill_tx_desc_null(struct rtwn_softc *sc, void *buf, int is11b, int qos, if (!qos) { txd->txdw8 = htole32(R12A_TXDW8_HWSEQ_EN); txd->txdw3 |= htole32(SM(R12A_TXDW3_SEQ_SEL, id)); - } } diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_tx_desc.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_tx_desc.h index 9d3ad8b181..ad01b6829d 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_tx_desc.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/r12a_tx_desc.h @@ -130,7 +130,6 @@ struct r12a_tx_desc { #define R12A_TXDW9_SEQ_S 12 } __packed __attribute__((aligned(4))); - /* Rate adaptation modes. */ #define R12A_RAID_11BGN_2_40 0 #define R12A_RAID_11BGN_1_40 1 diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au.h index 1ea08a2d94..bb4173d08a 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au.h @@ -31,7 +31,6 @@ #include - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_attach.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_attach.c index 209e772a15..dd5223ce96 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_attach.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_attach.c @@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12au_attach(struct rtwn_usb_softc *); static void diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_init.c index 9a6bc2bb7c..109ae5cba1 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_init.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12au_init_rx_agg(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_rx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_rx.c index a38fcd3332..de58a87354 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_rx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_rx.c @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include - int r12au_classify_intr(struct rtwn_softc *sc, void *buf, int len) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_tx.c index 5149668159..bc5f2ea9a0 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8812a/usb/r12au_tx.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r12au_dump_tx_desc(struct rtwn_softc *sc, const void *desc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a.h index cfc99cb9fb..9491cf4961 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a.h @@ -39,7 +39,6 @@ #define R21A_TX_PAGE_SIZE 256 - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_beacon.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_beacon.c index f88f6def1b..29de33e53f 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_beacon.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_beacon.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r21a_beacon_init(struct rtwn_softc *sc, void *buf, int id) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_calib.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_calib.c index e1f1522e9a..395231a37b 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_calib.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_calib.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE int r21a_iq_calib_fw_supported(struct rtwn_softc *sc) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_chan.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_chan.c index 49305057d2..68b3ef986f 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_chan.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_chan.c @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void r21a_bypass_ext_lna_2ghz(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_fw.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_fw.c index b0d0a5bcab..a512d8f4be 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_fw.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_fw.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - #ifndef RTWN_WITHOUT_UCODE void r21a_fw_reset(struct rtwn_softc *sc, int reason) diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_init.c index d8a0b1264e..8dc4faafe8 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_init.c @@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include - int r21a_power_on(struct rtwn_softc *sc) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_led.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_led.c index 3e682c2a5e..af75d40782 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_led.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_led.c @@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r21a_set_led(struct rtwn_softc *sc, int led, int on) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_priv.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_priv.h index d4cfa46afe..298dd36040 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_priv.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_priv.h @@ -60,7 +60,6 @@ static const struct rtwn_mac_prog rtl8821au_mac[] = { { 0x70b, 0x87 }, { 0x718, 0x40 } }; - /* * Baseband initialization values. */ @@ -217,7 +216,6 @@ static const struct rtwn_agc_prog rtl8821au_agc[] = { } }; - /* * RF initialization values. */ @@ -445,7 +443,6 @@ static const struct rtwn_rf_prog rtl8821au_rf[] = { { 0, NULL, NULL, { 0 }, NULL } }; - /* * Registers to save before IQ calibration. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_reg.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_reg.h index d13872d59c..287fcbd7f6 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_reg.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_reg.h @@ -38,7 +38,6 @@ #define R21A_DWBCN0_CTRL R92C_TDECTRL #define R21A_DWBCN1_CTRL 0x228 - /* Bits for R92C_MAC_PHY_CTRL. */ #define R21A_MAC_PHY_CRYSTALCAP_M 0x00fff000 #define R21A_MAC_PHY_CRYSTALCAP_S 12 diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_rom.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_rom.c index cda5913e9a..45642043c0 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_rom.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_rom.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r21a_parse_rom(struct rtwn_softc *sc, uint8_t *buf) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_rx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_rx.c index bd0721b3ed..5670c2bf70 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_rx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/r21a_rx.c @@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$"); #include - int8_t r21a_get_rssi_cck(struct rtwn_softc *sc, void *physt) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au.h index a327d2ad7f..5e000446a9 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au.h @@ -31,7 +31,6 @@ #include - /* * Function declarations. */ diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_attach.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_attach.c index 89a5bb870f..463d4876ae 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_attach.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_attach.c @@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$"); #include - void r21au_attach(struct rtwn_usb_softc *); static void diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_dfs.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_dfs.c index ef230c8525..d1940d23e8 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_dfs.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_dfs.c @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include - #define R21AU_RADAR_CHECK_PERIOD (2 * hz) static void diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_init.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_init.c index 140c291473..5f092def29 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_init.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/rtl8821a/usb/r21au_init.c @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - void r21au_init_tx_agg(struct rtwn_softc *sc) { @@ -69,4 +68,3 @@ r21au_init_tx_agg(struct rtwn_softc *sc) rtwn_write_1(sc, R21A_DWBCN1_CTRL, uc->tx_agg_desc_num << 1); } - diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_attach.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_attach.c index bdd6de2170..cb775bae31 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_attach.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_attach.c @@ -88,7 +88,6 @@ static void rtwn_usb_sysctlattach(struct rtwn_softc *); #define RTWN_CONFIG_INDEX 0 - static int rtwn_usb_match(device_t self) { diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_attach.h b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_attach.h index 437787a7fc..2a7c962838 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_attach.h +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_attach.h @@ -49,6 +49,7 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = { RTWN_RTL8192CU_DEV(AZUREWAVE, RTL8188CE_2), RTWN_RTL8192CU_DEV(AZUREWAVE, RTL8188CU), RTWN_RTL8192CU_DEV(BELKIN, F7D2102), + RTWN_RTL8192CU_DEV(BELKIN, F9L1004V1), RTWN_RTL8192CU_DEV(BELKIN, RTL8188CU), RTWN_RTL8192CU_DEV(BELKIN, RTL8192CU), RTWN_RTL8192CU_DEV(CHICONY, RTL8188CUS_1), @@ -116,12 +117,16 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = { #define RTWN_RTL8188EU_DEV(v,p) \ { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, RTWN_CHIP_RTL8188EU) } RTWN_RTL8188EU_DEV(ABOCOM, RTL8188EU), + RTWN_RTL8188EU_DEV(ASUS, USBN10NANOB1), RTWN_RTL8188EU_DEV(DLINK, DWA123D1), RTWN_RTL8188EU_DEV(DLINK, DWA125D1), + RTWN_RTL8188EU_DEV(EDIMAX, EW7811UN_V2), RTWN_RTL8188EU_DEV(ELECOM, WDC150SU2M), RTWN_RTL8188EU_DEV(TPLINK, WN722NV2), + RTWN_RTL8188EU_DEV(TPLINK, WN727NV5), RTWN_RTL8188EU_DEV(REALTEK, RTL8188ETV), RTWN_RTL8188EU_DEV(REALTEK, RTL8188EU), + RTWN_RTL8188EU_DEV(MERCUSYS, MW150US), #undef RTWN_RTL8188EU_DEV /* RTL8812AU */ @@ -136,9 +141,11 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = { RTWN_RTL8812AU_DEV(MELCO, WIU3866D), RTWN_RTL8812AU_DEV(NEC, WL900U), RTWN_RTL8812AU_DEV(PLANEX2, GW900D), - RTWN_RTL8812AU_DEV(REALTEK, RTL8812AU), + RTWN_RTL8812AU_DEV(REALTEK, RTL8812AU_1), + RTWN_RTL8812AU_DEV(REALTEK, RTL8812AU_2), RTWN_RTL8812AU_DEV(SENAO, EUB1200AC), RTWN_RTL8812AU_DEV(SITECOMEU, WLA7100), + RTWN_RTL8812AU_DEV(TENDA2, U12), RTWN_RTL8812AU_DEV(TPLINK, T4U), RTWN_RTL8812AU_DEV(TPLINK, T4UV2), RTWN_RTL8812AU_DEV(TPLINK, T4UHV1), @@ -154,9 +161,16 @@ static const STRUCT_USB_HOST_ID rtwn_devs[] = { RTWN_RTL8821AU_DEV(DLINK, DWA172A1), RTWN_RTL8821AU_DEV(EDIMAX, EW7811UTC_1), RTWN_RTL8821AU_DEV(EDIMAX, EW7811UTC_2), + RTWN_RTL8821AU_DEV(ELECOM, WDB433SU2M2), RTWN_RTL8821AU_DEV(HAWKING, HD65U), RTWN_RTL8821AU_DEV(MELCO, WIU2433DM), - RTWN_RTL8821AU_DEV(NETGEAR, A6100) + RTWN_RTL8821AU_DEV(MELCO, WIU2433DHP), + RTWN_RTL8821AU_DEV(NETGEAR, A6100), + RTWN_RTL8821AU_DEV(REALTEK, RTL8821AU_1), + RTWN_RTL8821AU_DEV(REALTEK, RTL8821AU_2), + RTWN_RTL8821AU_DEV(TPLINK, T2UNANO), + RTWN_RTL8821AU_DEV(TPLINK, T2UPLUS), + RTWN_RTL8821AU_DEV(TPLINK, T2UV3), #undef RTWN_RTL8821AU_DEV }; diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_ep.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_ep.c index 4cbb011a5b..b6658b6a03 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_ep.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_ep.c @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include - static const struct usb_config rtwn_config_common[RTWN_N_TRANSFER] = { [RTWN_BULK_RX] = { .type = UE_BULK, diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_reg.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_reg.c index 2091c6ac64..fad6d04ec5 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_reg.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_reg.c @@ -58,7 +58,6 @@ static int rtwn_usb_read_region_1(struct rtwn_softc *, /* USB Requests. */ #define R92C_REQ_REGS 0x05 - static int rtwn_do_request(struct rtwn_softc *sc, struct usb_device_request *req, void *data) @@ -172,8 +171,6 @@ rtwn_usb_delay(struct rtwn_softc *sc, int usec) /* 1ms delay as default is too big. */ if (usec < 1000) DELAY(usec); - else { - usb_pause_mtx(&sc->sc_mtx, - MAX(msecs_to_ticks(usec / 1000), 1)); - } + else + usb_pause_mtx(&sc->sc_mtx, msecs_to_ticks(usec / 1000)); } diff --git a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_tx.c b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_tx.c index 2c5d55d3a5..9e36474f1e 100644 --- a/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_tx.c +++ b/src/add-ons/kernel/drivers/network/wlan/realtekwifi/dev/rtwn/usb/rtwn_usb_tx.c @@ -67,12 +67,10 @@ static struct rtwn_data * rtwn_usb_getbuf(struct rtwn_usb_softc *); static void rtwn_usb_txeof(struct rtwn_usb_softc *, struct rtwn_data *, int); - static const uint8_t wme2qid[] = { RTWN_BULK_TX_BE, RTWN_BULK_TX_BK, RTWN_BULK_TX_VI, RTWN_BULK_TX_VO }; - static struct rtwn_data * _rtwn_usb_getbuf(struct rtwn_usb_softc *uc) {