From bcb071810ad5f81e646b119d8560a84b9f5daf2b Mon Sep 17 00:00:00 2001 From: Andriy Voskoboinyk <avos@FreeBSD.org> Date: Sat, 3 Dec 2016 14:26:58 +0000 Subject: [PATCH] rsu: remove unused structures / variables. --- sys/dev/usb/wlan/if_rsu.c | 3 --- sys/dev/usb/wlan/if_rsureg.h | 30 +----------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c index 4d08fefd24d2..c35448603c26 100644 --- a/sys/dev/usb/wlan/if_rsu.c +++ b/sys/dev/usb/wlan/if_rsu.c @@ -2937,9 +2937,6 @@ rsu_init(struct rsu_softc *sc) /* Ensure the mbuf queue is drained */ rsu_drain_mbufq(sc); - /* Init host async commands ring. */ - sc->cmdq.cur = sc->cmdq.next = sc->cmdq.queued = 0; - /* Reset power management state. */ rsu_write_1(sc, R92S_USB_HRPWM, 0); diff --git a/sys/dev/usb/wlan/if_rsureg.h b/sys/dev/usb/wlan/if_rsureg.h index f196e914189e..05f2ebcb900a 100644 --- a/sys/dev/usb/wlan/if_rsureg.h +++ b/sys/dev/usb/wlan/if_rsureg.h @@ -625,8 +625,6 @@ struct r92s_add_ba_req { #define RSU_RX_LIST_COUNT 100 #define RSU_TX_LIST_COUNT 32 -#define RSU_HOST_CMD_RING_COUNT 32 - #define RSU_RXBUFSZ (8 * 1024) #define RSU_TXBUFSZ \ ((sizeof(struct r92s_tx_desc) + IEEE80211_MAX_LEN + 3) & ~3) @@ -700,27 +698,6 @@ struct rsu_tx_radiotap_header { struct rsu_softc; -struct rsu_host_cmd { - void (*cb)(struct rsu_softc *, void *); - uint8_t data[256]; -}; - -struct rsu_cmd_newstate { - enum ieee80211_state state; - int arg; -}; - -struct rsu_cmd_key { - struct ieee80211_key key; -}; - -struct rsu_host_cmd_ring { - struct rsu_host_cmd cmd[RSU_HOST_CMD_RING_COUNT]; - int cur; - int next; - int queued; -}; - enum { RSU_BULK_RX, RSU_BULK_TX_BE_BK, /* = WME_AC_BE/BK */ @@ -755,12 +732,9 @@ struct rsu_softc { struct mbufq sc_snd; device_t sc_dev; struct usb_device *sc_udev; - int (*sc_newstate)(struct ieee80211com *, - enum ieee80211_state, int); - struct usbd_interface *sc_iface; + struct timeout_task calib_task; struct task tx_task; - const uint8_t *qid2idx; struct mtx sc_mtx; int sc_ht; int sc_nendpoints; @@ -775,10 +749,8 @@ struct rsu_softc { uint8_t sc_rftype; int8_t sc_nrxstream; int8_t sc_ntxstream; - struct rsu_host_cmd_ring cmdq; struct rsu_data sc_rx[RSU_RX_LIST_COUNT]; struct rsu_data sc_tx[RSU_TX_LIST_COUNT]; - struct rsu_data *fwcmd_data; uint8_t cmd_seq; uint8_t rom[128]; struct usb_xfer *sc_xfer[RSU_N_TRANSFER];