commit 9e53d5c1b01e5a1e20c41831c27efe6334144504 Author: Jiri Slaby Date: Thu Jul 19 08:36:49 2007 +0200 remove some unused stuff from ath.h diff --git a/ath.c b/ath.c index 847589b..c6dde74 100644 --- a/ath.c +++ b/ath.c @@ -482,7 +482,7 @@ static void ath_mode_init(struct ath_softc *sc) rfilt = ath_calcrxfilter(sc); ath5k_hw_set_rx_filter(ah, rfilt); - if (ath_hal_hasbssidmask(ah)) + if (ath5k_hw_hasbssidmask(ah)) ath5k_hw_set_bssid_mask(ah, sc->bssidmask); /* configure operational mode */ @@ -1832,7 +1832,7 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) ath5k_hw_get_lladdr(ah, mac); SET_IEEE80211_PERM_ADDR(hw, mac); - if (ath_hal_hasbssidmask(ah)) { + if (ath5k_hw_hasbssidmask(ah)) { memset(sc->bssidmask, 0xff, ETH_ALEN); ath5k_hw_set_bssid_mask(ah, sc->bssidmask); } diff --git a/ath.h b/ath.h index 45b3a9f..2baa4aa 100644 --- a/ath.h +++ b/ath.h @@ -130,10 +130,8 @@ struct ath_softc { struct ieee80211_channel channels[ATH_CHAN_MAX]; struct ieee80211_rate rates[AR5K_MAX_RATES * NUM_IEEE80211_MODES]; struct ath_hw *ah; /* Atheros HW */ -#ifdef BLE - enum ieee80211_if_types sc_opmode; - int sc_regdomain; - int sc_countrycode; +#ifdef UNUSED + enum ieee80211_if_types opmode; #endif int debug; @@ -142,39 +140,29 @@ struct ath_softc { dma_addr_t desc_daddr; /* DMA (physical) address */ size_t desc_len; /* size of TX/RX descriptors */ u16 cachelsz; /* cache line size */ -#ifdef BLE - struct ath_ratectrl *sc_rc; /* tx rate control support */ +#ifdef UNUSED void (*sc_setdefantenna)(struct ath_softc *, u_int); #endif unsigned int invalid : 1, /* disable hardware accesses */ mrretry : 1, /* multi-rate retry support */ - promisc : 1, - xxx:1; -#ifdef BLE - sc_splitmic: 1, /* split TKIP MIC keys */ - sc_needmib : 1, /* enable MIB stats intr */ + promisc : 1; +#ifdef UNUSED sc_diversity : 1,/* enable rx diversity */ - sc_lockslottime : 1,/* lock slot time value */ sc_hasveol : 1, /* tx VEOL support */ sc_mcastkey: 1, /* mcast key cache search */ sc_hasclrkey:1; /* CLR key supported */ /* rate tables */ - const struct ath5k_rate_table *sc_rates[NUM_IEEE80211_MODES]; - const struct ath5k_rate_table *sc_currates; /* current rate table */ #endif unsigned int curmode; /* current phy mode */ struct ieee80211_channel *curchan; /* current h/w channel */ -#ifdef BLE - u16 sc_curtxpow; /* current tx power limit */ - u8 sc_rixmap[256]; /* IEEE to h/w rate table ix */ -#endif + struct { u8 rxflags; /* radiotap rx flags */ u8 txflags; /* radiotap tx flags */ u16 ledon; /* softled on time */ u16 ledoff; /* softled off time */ } hwmap[32]; /* h/w rate ix mappings */ -#ifdef BLE +#ifdef UNUSED u8 sc_protrix; /* protection rate index */ u_int sc_txantenna; /* tx antenna (fixed or auto) */ #endif @@ -193,19 +181,7 @@ struct ath_softc { struct timer_list led_tim; /* led off timer */ u8 led_rxrate; /* current rx rate for LED */ u8 led_txrate; /* current tx rate for LED */ -#ifdef BLE - union { - struct ath_tx_radiotap_header th; - u8 pad[64]; - } u_tx_rt; - int sc_tx_th_len; - union { - struct ath_rx_radiotap_header th; - u8 pad[64]; - } u_rx_rt; - int sc_rx_th_len; - struct tasklet_struct sc_radartq; /* Radar detection */ -#endif + struct tasklet_struct restq; /* reset tasklet */ unsigned int rxbufsize; /* rx size based on mtu */ @@ -213,22 +189,20 @@ struct ath_softc { spinlock_t rxbuflock; u32 *rxlink; /* link ptr in last RX desc */ struct tasklet_struct rxtq; /* rx intr tasklet */ -#ifdef BLE +#ifdef UNUSED u8 sc_defant; /* current default antenna */ u8 sc_rxotherant; /* rx's on non-default antenna*/ #endif struct list_head txbuf; /* transmit buffer */ spinlock_t txbuflock; struct ath_txq txqs[2]; /* beacon and tx */ -#ifdef BLE - int sc_tx_timer; /* transmit timeout */ - u_int sc_txintrperiod;/* tx interrupt batching */ +#ifdef UNUSED struct ath_txq *sc_ac2q[5]; /* WME AC -> h/w q map */ #endif struct ath_txq *txq; /* beacon and tx*/ struct tasklet_struct txtq; /* tx intr tasklet */ -#ifdef BLE +#ifdef BEACON struct list_head bbuf; /* beacon buffers */ unsigned int bhalq; /* HAL q for outgoing beacons */ u_int sc_bmisscount; /* missed beacon transmits */ @@ -237,43 +211,16 @@ struct ath_softc { struct ath_txq *cabq; /* tx q for cab frames */ struct tasklet_struct bmisstq; /* bmiss intr tasklet */ - struct tasklet_struct sc_bstuckq; /* stuck beacon processing */ - enum { - OK, /* no change needed */ - UPDATE, /* update pending */ - COMMIT /* beacon sent, commit change */ - } sc_updateslot; /* slot time update fsm */ - - struct iw_statistics sc_iwstats; /* wireless statistics block */ +#endif +#ifdef UNUSED struct ctl_table_header *sc_sysctl_header; struct ctl_table *sc_sysctls; #endif struct timer_list calib_tim; /* calibration timer */ }; -void ath_sysctl_register(void); -void ath_sysctl_unregister(void); - -#define ath_hal_getcountrycode(_ah, _pcc) \ - (*(_pcc) = (_ah)->ah_country_code) -#define ath_hal_tkipsplit(_ah) \ - (ath5k_hw_get_capability(_ah, AR5K_CAP_TKIP_SPLIT, 0, NULL) == 0) -#define ath_hal_hwphycounters(_ah) \ - (ath5k_hw_get_capability(_ah, AR5K_CAP_PHYCOUNTERS, 0, NULL) == 0) -#define ath_hal_getnumtxqueues(_ah, _pv) \ - (ath5k_hw_get_capability(_ah, AR5K_CAP_NUM_TXQUEUES, 0, _pv) == 0) -#define ath_hal_hasveol(_ah) \ - (ath5k_hw_get_capability(_ah, AR5K_CAP_VEOL, 0, NULL) == 0) -#define ath_hal_hastpc(_ah) \ - (ath5k_hw_get_capability(_ah, AR5K_CAP_TPC, 0, NULL) == 0) -#define ath_hal_gettpc(_ah) \ - (ath5k_hw_get_capability(_ah, AR5K_CAP_TPC, 1, NULL) == 0) -#define ath_hal_settpc(_ah, _v) \ - ath5k_hw_set_capability(_ah, AR5K_CAP_TPC, 1, _v, NULL) -#define ath_hal_hasbursting(_ah) \ - (ath5k_hw_get_capability(_ah, AR5K_CAP_BURST, 0, NULL) == 0) -#define ath_hal_hasbssidmask(_ah) \ +#define ath5k_hw_hasbssidmask(_ah) \ (ath5k_hw_get_capability(_ah, AR5K_CAP_BSSIDMASK, 0, NULL) == 0) #endif