diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.h')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h index f9b7f2f819b7..778e422946ab 100644 --- a/drivers/net/wireless/ath/ath5k/base.h +++ b/drivers/net/wireless/ath/ath5k/base.h | |||
@@ -114,8 +114,7 @@ struct ath5k_softc { | |||
114 | struct pci_dev *pdev; /* for dma mapping */ | 114 | struct pci_dev *pdev; /* for dma mapping */ |
115 | void __iomem *iobase; /* address of the device */ | 115 | void __iomem *iobase; /* address of the device */ |
116 | struct mutex lock; /* dev-level lock */ | 116 | struct mutex lock; /* dev-level lock */ |
117 | /* FIXME: how many does it really need? */ | 117 | struct ieee80211_tx_queue_stats tx_stats[AR5K_NUM_TX_QUEUES]; |
118 | struct ieee80211_tx_queue_stats tx_stats[16]; | ||
119 | struct ieee80211_low_level_stats ll_stats; | 118 | struct ieee80211_low_level_stats ll_stats; |
120 | struct ieee80211_hw *hw; /* IEEE 802.11 common */ | 119 | struct ieee80211_hw *hw; /* IEEE 802.11 common */ |
121 | struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; | 120 | struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; |
@@ -171,9 +170,8 @@ struct ath5k_softc { | |||
171 | struct list_head txbuf; /* transmit buffer */ | 170 | struct list_head txbuf; /* transmit buffer */ |
172 | spinlock_t txbuflock; | 171 | spinlock_t txbuflock; |
173 | unsigned int txbuf_len; /* buf count in txbuf list */ | 172 | unsigned int txbuf_len; /* buf count in txbuf list */ |
174 | struct ath5k_txq txqs[2]; /* beacon and tx */ | 173 | struct ath5k_txq txqs[AR5K_NUM_TX_QUEUES]; /* tx queues */ |
175 | 174 | struct ath5k_txq *txq; /* main tx queue */ | |
176 | struct ath5k_txq *txq; /* beacon and tx*/ | ||
177 | struct tasklet_struct txtq; /* tx intr tasklet */ | 175 | struct tasklet_struct txtq; /* tx intr tasklet */ |
178 | struct ath5k_led tx_led; /* tx led */ | 176 | struct ath5k_led tx_led; /* tx led */ |
179 | 177 | ||
@@ -187,10 +185,12 @@ struct ath5k_softc { | |||
187 | bintval, /* beacon interval in TU */ | 185 | bintval, /* beacon interval in TU */ |
188 | bsent; | 186 | bsent; |
189 | unsigned int nexttbtt; /* next beacon time in TU */ | 187 | unsigned int nexttbtt; /* next beacon time in TU */ |
188 | struct ath5k_txq *cabq; /* content after beacon */ | ||
190 | 189 | ||
191 | struct timer_list calib_tim; /* calibration timer */ | 190 | struct timer_list calib_tim; /* calibration timer */ |
192 | int power_level; /* Requested tx power in dbm */ | 191 | int power_level; /* Requested tx power in dbm */ |
193 | bool assoc; /* assocate state */ | 192 | bool assoc; /* assocate state */ |
193 | bool enable_beacon; /* true if beacons are on */ | ||
194 | }; | 194 | }; |
195 | 195 | ||
196 | #define ath5k_hw_hasbssidmask(_ah) \ | 196 | #define ath5k_hw_hasbssidmask(_ah) \ |