diff options
Diffstat (limited to 'drivers/net/wireless/ath/ath5k/base.h')
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h index 33f1d8b87ee1..56221bc7c8cd 100644 --- a/drivers/net/wireless/ath/ath5k/base.h +++ b/drivers/net/wireless/ath/ath5k/base.h | |||
@@ -50,6 +50,7 @@ | |||
50 | 50 | ||
51 | #include "ath5k.h" | 51 | #include "ath5k.h" |
52 | #include "debug.h" | 52 | #include "debug.h" |
53 | #include "ani.h" | ||
53 | 54 | ||
54 | #include "../regd.h" | 55 | #include "../regd.h" |
55 | #include "../ath.h" | 56 | #include "../ath.h" |
@@ -105,14 +106,18 @@ struct ath5k_rfkill { | |||
105 | struct tasklet_struct toggleq; | 106 | struct tasklet_struct toggleq; |
106 | }; | 107 | }; |
107 | 108 | ||
108 | /* statistics (only used for debugging now) */ | 109 | /* statistics */ |
109 | struct ath5k_statistics { | 110 | struct ath5k_statistics { |
111 | /* antenna use */ | ||
110 | unsigned int antenna_rx[5]; /* frames count per antenna RX */ | 112 | unsigned int antenna_rx[5]; /* frames count per antenna RX */ |
111 | unsigned int antenna_tx[5]; /* frames count per antenna TX */ | 113 | unsigned int antenna_tx[5]; /* frames count per antenna TX */ |
114 | |||
115 | /* frame errors */ | ||
112 | unsigned int rx_all_count; /* all RX frames, including errors */ | 116 | unsigned int rx_all_count; /* all RX frames, including errors */ |
113 | unsigned int tx_all_count; /* all TX frames, including errors */ | 117 | unsigned int tx_all_count; /* all TX frames, including errors */ |
114 | unsigned int rxerr_crc; | 118 | unsigned int rxerr_crc; |
115 | unsigned int rxerr_phy; | 119 | unsigned int rxerr_phy; |
120 | unsigned int rxerr_phy_code[32]; | ||
116 | unsigned int rxerr_fifo; | 121 | unsigned int rxerr_fifo; |
117 | unsigned int rxerr_decrypt; | 122 | unsigned int rxerr_decrypt; |
118 | unsigned int rxerr_mic; | 123 | unsigned int rxerr_mic; |
@@ -121,6 +126,16 @@ struct ath5k_statistics { | |||
121 | unsigned int txerr_retry; | 126 | unsigned int txerr_retry; |
122 | unsigned int txerr_fifo; | 127 | unsigned int txerr_fifo; |
123 | unsigned int txerr_filt; | 128 | unsigned int txerr_filt; |
129 | |||
130 | /* MIB counters */ | ||
131 | unsigned int ack_fail; | ||
132 | unsigned int rts_fail; | ||
133 | unsigned int rts_ok; | ||
134 | unsigned int fcs_error; | ||
135 | unsigned int beacons; | ||
136 | |||
137 | unsigned int mib_intr; | ||
138 | unsigned int rxorn_intr; | ||
124 | }; | 139 | }; |
125 | 140 | ||
126 | #if CHAN_DEBUG | 141 | #if CHAN_DEBUG |
@@ -135,7 +150,6 @@ struct ath5k_softc { | |||
135 | struct pci_dev *pdev; /* for dma mapping */ | 150 | struct pci_dev *pdev; /* for dma mapping */ |
136 | void __iomem *iobase; /* address of the device */ | 151 | void __iomem *iobase; /* address of the device */ |
137 | struct mutex lock; /* dev-level lock */ | 152 | struct mutex lock; /* dev-level lock */ |
138 | struct ieee80211_low_level_stats ll_stats; | ||
139 | struct ieee80211_hw *hw; /* IEEE 802.11 common */ | 153 | struct ieee80211_hw *hw; /* IEEE 802.11 common */ |
140 | struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; | 154 | struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; |
141 | struct ieee80211_channel channels[ATH_CHAN_MAX]; | 155 | struct ieee80211_channel channels[ATH_CHAN_MAX]; |
@@ -211,6 +225,9 @@ struct ath5k_softc { | |||
211 | bool enable_beacon; /* true if beacons are on */ | 225 | bool enable_beacon; /* true if beacons are on */ |
212 | 226 | ||
213 | struct ath5k_statistics stats; | 227 | struct ath5k_statistics stats; |
228 | |||
229 | struct ath5k_ani_state ani_state; | ||
230 | struct tasklet_struct ani_tasklet; /* ANI calibration */ | ||
214 | }; | 231 | }; |
215 | 232 | ||
216 | #define ath5k_hw_hasbssidmask(_ah) \ | 233 | #define ath5k_hw_hasbssidmask(_ah) \ |