diff options
Diffstat (limited to 'drivers')
22 files changed, 62 insertions, 70 deletions
diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c index 603ae15f139b..bea90e6be70e 100644 --- a/drivers/net/wireless/ath/ath5k/ani.c +++ b/drivers/net/wireless/ath/ath5k/ani.c | |||
@@ -15,7 +15,6 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "ath5k.h" | 17 | #include "ath5k.h" |
18 | #include "base.h" | ||
19 | #include "reg.h" | 18 | #include "reg.h" |
20 | #include "debug.h" | 19 | #include "debug.h" |
21 | #include "ani.h" | 20 | #include "ani.h" |
diff --git a/drivers/net/wireless/ath/ath5k/ani.h b/drivers/net/wireless/ath/ath5k/ani.h index 034015397093..7358b6c83c6c 100644 --- a/drivers/net/wireless/ath/ath5k/ani.h +++ b/drivers/net/wireless/ath/ath5k/ani.h | |||
@@ -16,6 +16,10 @@ | |||
16 | #ifndef ANI_H | 16 | #ifndef ANI_H |
17 | #define ANI_H | 17 | #define ANI_H |
18 | 18 | ||
19 | #include "../ath.h" | ||
20 | |||
21 | enum ath5k_phy_error_code; | ||
22 | |||
19 | /* these thresholds are relative to the ATH5K_ANI_LISTEN_PERIOD */ | 23 | /* these thresholds are relative to the ATH5K_ANI_LISTEN_PERIOD */ |
20 | #define ATH5K_ANI_LISTEN_PERIOD 100 | 24 | #define ATH5K_ANI_LISTEN_PERIOD 100 |
21 | #define ATH5K_ANI_OFDM_TRIG_HIGH 500 | 25 | #define ATH5K_ANI_OFDM_TRIG_HIGH 500 |
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h index 0d413be3b7e1..fecbcd9a4259 100644 --- a/drivers/net/wireless/ath/ath5k/ath5k.h +++ b/drivers/net/wireless/ath/ath5k/ath5k.h | |||
@@ -287,17 +287,6 @@ enum ath5k_radio { | |||
287 | * Common silicon revision/version values | 287 | * Common silicon revision/version values |
288 | */ | 288 | */ |
289 | 289 | ||
290 | enum ath5k_srev_type { | ||
291 | AR5K_VERSION_MAC, | ||
292 | AR5K_VERSION_RAD, | ||
293 | }; | ||
294 | |||
295 | struct ath5k_srev_name { | ||
296 | const char *sr_name; | ||
297 | enum ath5k_srev_type sr_type; | ||
298 | u_int sr_val; | ||
299 | }; | ||
300 | |||
301 | #define AR5K_SREV_UNKNOWN 0xffff | 290 | #define AR5K_SREV_UNKNOWN 0xffff |
302 | 291 | ||
303 | #define AR5K_SREV_AR5210 0x00 /* Crete */ | 292 | #define AR5K_SREV_AR5210 0x00 /* Crete */ |
@@ -1271,36 +1260,13 @@ struct ath_bus_ops { | |||
1271 | extern const struct ieee80211_ops ath5k_hw_ops; | 1260 | extern const struct ieee80211_ops ath5k_hw_ops; |
1272 | 1261 | ||
1273 | /* Initialization and detach functions */ | 1262 | /* Initialization and detach functions */ |
1274 | int ath5k_init_softc(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops); | ||
1275 | void ath5k_deinit_softc(struct ath5k_hw *ah); | ||
1276 | int ath5k_hw_init(struct ath5k_hw *ah); | 1263 | int ath5k_hw_init(struct ath5k_hw *ah); |
1277 | void ath5k_hw_deinit(struct ath5k_hw *ah); | 1264 | void ath5k_hw_deinit(struct ath5k_hw *ah); |
1278 | 1265 | ||
1279 | int ath5k_sysfs_register(struct ath5k_hw *ah); | 1266 | int ath5k_sysfs_register(struct ath5k_hw *ah); |
1280 | void ath5k_sysfs_unregister(struct ath5k_hw *ah); | 1267 | void ath5k_sysfs_unregister(struct ath5k_hw *ah); |
1281 | 1268 | ||
1282 | /* base.c */ | ||
1283 | struct ath5k_buf; | ||
1284 | struct ath5k_txq; | ||
1285 | |||
1286 | void ath5k_set_beacon_filter(struct ieee80211_hw *hw, bool enable); | ||
1287 | bool ath5k_any_vif_assoc(struct ath5k_hw *ah); | ||
1288 | void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb, | ||
1289 | struct ath5k_txq *txq); | ||
1290 | int ath5k_start(struct ieee80211_hw *hw); | ||
1291 | void ath5k_stop(struct ieee80211_hw *hw); | ||
1292 | void ath5k_mode_setup(struct ath5k_hw *ah, struct ieee80211_vif *vif); | ||
1293 | void ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah, | ||
1294 | struct ieee80211_vif *vif); | ||
1295 | int ath5k_chan_set(struct ath5k_hw *ah, struct ieee80211_channel *chan); | ||
1296 | void ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf); | ||
1297 | int ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif); | ||
1298 | void ath5k_beacon_config(struct ath5k_hw *ah); | ||
1299 | void ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf); | ||
1300 | void ath5k_rxbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf); | ||
1301 | |||
1302 | /*Chip id helper functions */ | 1269 | /*Chip id helper functions */ |
1303 | const char *ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val); | ||
1304 | int ath5k_hw_read_srev(struct ath5k_hw *ah); | 1270 | int ath5k_hw_read_srev(struct ath5k_hw *ah); |
1305 | 1271 | ||
1306 | /* LED functions */ | 1272 | /* LED functions */ |
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c index 56062594ff7a..96627ed6d57a 100644 --- a/drivers/net/wireless/ath/ath5k/attach.c +++ b/drivers/net/wireless/ath/ath5k/attach.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "ath5k.h" | 25 | #include "ath5k.h" |
26 | #include "reg.h" | 26 | #include "reg.h" |
27 | #include "debug.h" | 27 | #include "debug.h" |
28 | #include "base.h" | ||
29 | 28 | ||
30 | /** | 29 | /** |
31 | * ath5k_hw_post - Power On Self Test helper function | 30 | * ath5k_hw_post - Power On Self Test helper function |
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 7021c9f2c0f7..e5adad4bc522 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
@@ -52,6 +52,7 @@ | |||
52 | #include <linux/uaccess.h> | 52 | #include <linux/uaccess.h> |
53 | #include <linux/slab.h> | 53 | #include <linux/slab.h> |
54 | #include <linux/etherdevice.h> | 54 | #include <linux/etherdevice.h> |
55 | #include <linux/nl80211.h> | ||
55 | 56 | ||
56 | #include <net/ieee80211_radiotap.h> | 57 | #include <net/ieee80211_radiotap.h> |
57 | 58 | ||
@@ -61,6 +62,8 @@ | |||
61 | #include "reg.h" | 62 | #include "reg.h" |
62 | #include "debug.h" | 63 | #include "debug.h" |
63 | #include "ani.h" | 64 | #include "ani.h" |
65 | #include "ath5k.h" | ||
66 | #include "../regd.h" | ||
64 | 67 | ||
65 | #define CREATE_TRACE_POINTS | 68 | #define CREATE_TRACE_POINTS |
66 | #include "trace.h" | 69 | #include "trace.h" |
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h index 375df849b2e4..3952cc8dc4f7 100644 --- a/drivers/net/wireless/ath/ath5k/base.h +++ b/drivers/net/wireless/ath/ath5k/base.h | |||
@@ -38,18 +38,27 @@ | |||
38 | /* | 38 | /* |
39 | * Definitions for the Atheros Wireless LAN controller driver. | 39 | * Definitions for the Atheros Wireless LAN controller driver. |
40 | */ | 40 | */ |
41 | #ifndef _DEV_ATH_ATHVAR_H | 41 | #ifndef _DEV_ATH5K_BASE_H |
42 | #define _DEV_ATH_ATHVAR_H | 42 | #define _DEV_ATH5K_BASE_H |
43 | 43 | ||
44 | #include <linux/interrupt.h> | 44 | struct ieee80211_vif; |
45 | #include <linux/list.h> | 45 | struct ieee80211_hw; |
46 | #include <linux/if_ether.h> | 46 | struct ath5k_hw; |
47 | #include <linux/rfkill.h> | 47 | struct ath5k_txq; |
48 | #include <linux/workqueue.h> | 48 | struct ieee80211_channel; |
49 | struct ath_bus_ops; | ||
50 | enum nl80211_iftype; | ||
49 | 51 | ||
50 | #include "ath5k.h" | 52 | enum ath5k_srev_type { |
51 | #include "../regd.h" | 53 | AR5K_VERSION_MAC, |
52 | #include "../ath.h" | 54 | AR5K_VERSION_RAD, |
55 | }; | ||
56 | |||
57 | struct ath5k_srev_name { | ||
58 | const char *sr_name; | ||
59 | enum ath5k_srev_type sr_type; | ||
60 | u_int sr_val; | ||
61 | }; | ||
53 | 62 | ||
54 | struct ath5k_buf { | 63 | struct ath5k_buf { |
55 | struct list_head list; | 64 | struct list_head list; |
@@ -76,8 +85,30 @@ struct ath5k_vif_iter_data { | |||
76 | enum nl80211_iftype opmode; | 85 | enum nl80211_iftype opmode; |
77 | int n_stas; | 86 | int n_stas; |
78 | }; | 87 | }; |
88 | |||
79 | void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif); | 89 | void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif); |
90 | bool ath5k_any_vif_assoc(struct ath5k_hw *ah); | ||
91 | |||
92 | int ath5k_start(struct ieee80211_hw *hw); | ||
93 | void ath5k_stop(struct ieee80211_hw *hw); | ||
94 | |||
95 | void ath5k_beacon_update_timers(struct ath5k_hw *ah, u64 bc_tsf); | ||
96 | int ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif); | ||
97 | void ath5k_beacon_config(struct ath5k_hw *ah); | ||
98 | void ath5k_set_beacon_filter(struct ieee80211_hw *hw, bool enable); | ||
99 | |||
100 | void ath5k_update_bssid_mask_and_opmode(struct ath5k_hw *ah, | ||
101 | struct ieee80211_vif *vif); | ||
102 | int ath5k_chan_set(struct ath5k_hw *ah, struct ieee80211_channel *chan); | ||
103 | void ath5k_txbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf); | ||
104 | void ath5k_rxbuf_free_skb(struct ath5k_hw *ah, struct ath5k_buf *bf); | ||
105 | void ath5k_tx_queue(struct ieee80211_hw *hw, struct sk_buff *skb, | ||
106 | struct ath5k_txq *txq); | ||
107 | |||
108 | const char *ath5k_chip_name(enum ath5k_srev_type type, u_int16_t val); | ||
80 | 109 | ||
110 | int ath5k_init_softc(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops); | ||
111 | void ath5k_deinit_softc(struct ath5k_hw *ah); | ||
81 | 112 | ||
82 | /* Check whether BSSID mask is supported */ | 113 | /* Check whether BSSID mask is supported */ |
83 | #define ath5k_hw_hasbssidmask(_ah) (ah->ah_version == AR5K_AR5212) | 114 | #define ath5k_hw_hasbssidmask(_ah) (ah->ah_version == AR5K_AR5212) |
@@ -85,4 +116,4 @@ void ath5k_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif); | |||
85 | /* Check whether virtual EOL is supported */ | 116 | /* Check whether virtual EOL is supported */ |
86 | #define ath5k_hw_hasveol(_ah) (ah->ah_version != AR5K_AR5210) | 117 | #define ath5k_hw_hasveol(_ah) (ah->ah_version != AR5K_AR5210) |
87 | 118 | ||
88 | #endif | 119 | #endif /* _DEV_ATH5K_BASE_H */ |
diff --git a/drivers/net/wireless/ath/ath5k/caps.c b/drivers/net/wireless/ath/ath5k/caps.c index eefe670e28a7..810fba96702b 100644 --- a/drivers/net/wireless/ath/ath5k/caps.c +++ b/drivers/net/wireless/ath/ath5k/caps.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include "ath5k.h" | 24 | #include "ath5k.h" |
25 | #include "reg.h" | 25 | #include "reg.h" |
26 | #include "debug.h" | 26 | #include "debug.h" |
27 | #include "base.h" | 27 | #include "../regd.h" |
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Fill the capabilities struct | 30 | * Fill the capabilities struct |
diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c index ccca724de173..fce8c904eea9 100644 --- a/drivers/net/wireless/ath/ath5k/debug.c +++ b/drivers/net/wireless/ath/ath5k/debug.c | |||
@@ -58,19 +58,18 @@ | |||
58 | * THE POSSIBILITY OF SUCH DAMAGES. | 58 | * THE POSSIBILITY OF SUCH DAMAGES. |
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "base.h" | 61 | #include <linux/module.h> |
62 | #include <linux/seq_file.h> | ||
63 | #include <linux/list.h> | ||
62 | #include "debug.h" | 64 | #include "debug.h" |
65 | #include "ath5k.h" | ||
66 | #include "reg.h" | ||
67 | #include "base.h" | ||
63 | 68 | ||
64 | static unsigned int ath5k_debug; | 69 | static unsigned int ath5k_debug; |
65 | module_param_named(debug, ath5k_debug, uint, 0); | 70 | module_param_named(debug, ath5k_debug, uint, 0); |
66 | 71 | ||
67 | 72 | ||
68 | #ifdef CONFIG_ATH5K_DEBUG | ||
69 | |||
70 | #include <linux/seq_file.h> | ||
71 | #include "reg.h" | ||
72 | #include "ani.h" | ||
73 | |||
74 | static int ath5k_debugfs_open(struct inode *inode, struct file *file) | 73 | static int ath5k_debugfs_open(struct inode *inode, struct file *file) |
75 | { | 74 | { |
76 | file->private_data = inode->i_private; | 75 | file->private_data = inode->i_private; |
@@ -1031,5 +1030,3 @@ ath5k_debug_printtxbuf(struct ath5k_hw *ah, struct ath5k_buf *bf) | |||
1031 | td->tx_stat.tx_status_0, td->tx_stat.tx_status_1, | 1030 | td->tx_stat.tx_status_0, td->tx_stat.tx_status_1, |
1032 | done ? ' ' : (ts.ts_status == 0) ? '*' : '!'); | 1031 | done ? ' ' : (ts.ts_status == 0) ? '*' : '!'); |
1033 | } | 1032 | } |
1034 | |||
1035 | #endif /* ifdef CONFIG_ATH5K_DEBUG */ | ||
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c index 846535f59efc..7e88dda82221 100644 --- a/drivers/net/wireless/ath/ath5k/desc.c +++ b/drivers/net/wireless/ath/ath5k/desc.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include "ath5k.h" | 24 | #include "ath5k.h" |
25 | #include "reg.h" | 25 | #include "reg.h" |
26 | #include "debug.h" | 26 | #include "debug.h" |
27 | #include "base.h" | ||
28 | 27 | ||
29 | 28 | ||
30 | /************************\ | 29 | /************************\ |
diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c index 0d5d4033f12a..2481f9c7f4b6 100644 --- a/drivers/net/wireless/ath/ath5k/dma.c +++ b/drivers/net/wireless/ath/ath5k/dma.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include "ath5k.h" | 35 | #include "ath5k.h" |
36 | #include "reg.h" | 36 | #include "reg.h" |
37 | #include "debug.h" | 37 | #include "debug.h" |
38 | #include "base.h" | ||
39 | 38 | ||
40 | 39 | ||
41 | /*********\ | 40 | /*********\ |
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c index 7c9c2ab7d935..cd708c15b774 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.c +++ b/drivers/net/wireless/ath/ath5k/eeprom.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "ath5k.h" | 26 | #include "ath5k.h" |
27 | #include "reg.h" | 27 | #include "reg.h" |
28 | #include "debug.h" | 28 | #include "debug.h" |
29 | #include "base.h" | ||
30 | 29 | ||
31 | 30 | ||
32 | /******************\ | 31 | /******************\ |
diff --git a/drivers/net/wireless/ath/ath5k/gpio.c b/drivers/net/wireless/ath/ath5k/gpio.c index bc90503f4b7a..859297811914 100644 --- a/drivers/net/wireless/ath/ath5k/gpio.c +++ b/drivers/net/wireless/ath/ath5k/gpio.c | |||
@@ -23,7 +23,6 @@ | |||
23 | #include "ath5k.h" | 23 | #include "ath5k.h" |
24 | #include "reg.h" | 24 | #include "reg.h" |
25 | #include "debug.h" | 25 | #include "debug.h" |
26 | #include "base.h" | ||
27 | 26 | ||
28 | /* | 27 | /* |
29 | * Set led state | 28 | * Set led state |
diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c index 5ab607f40e0e..1ffecc0fd3ed 100644 --- a/drivers/net/wireless/ath/ath5k/initvals.c +++ b/drivers/net/wireless/ath/ath5k/initvals.c | |||
@@ -22,7 +22,6 @@ | |||
22 | #include "ath5k.h" | 22 | #include "ath5k.h" |
23 | #include "reg.h" | 23 | #include "reg.h" |
24 | #include "debug.h" | 24 | #include "debug.h" |
25 | #include "base.h" | ||
26 | 25 | ||
27 | /* | 26 | /* |
28 | * Mode-independent initial register writes | 27 | * Mode-independent initial register writes |
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c index 8c17a00f7dad..c1151c723711 100644 --- a/drivers/net/wireless/ath/ath5k/led.c +++ b/drivers/net/wireless/ath/ath5k/led.c | |||
@@ -41,7 +41,6 @@ | |||
41 | 41 | ||
42 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
43 | #include "ath5k.h" | 43 | #include "ath5k.h" |
44 | #include "base.h" | ||
45 | 44 | ||
46 | #define ATH_SDEVICE(subv, subd) \ | 45 | #define ATH_SDEVICE(subv, subd) \ |
47 | .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \ | 46 | .vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \ |
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c index 53d3af92bffa..0560234ec3f6 100644 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c | |||
@@ -41,8 +41,10 @@ | |||
41 | * | 41 | * |
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include <net/mac80211.h> | ||
44 | #include <asm/unaligned.h> | 45 | #include <asm/unaligned.h> |
45 | 46 | ||
47 | #include "ath5k.h" | ||
46 | #include "base.h" | 48 | #include "base.h" |
47 | #include "reg.h" | 49 | #include "reg.h" |
48 | 50 | ||
diff --git a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c index 733d46c18841..a7eafa3edc21 100644 --- a/drivers/net/wireless/ath/ath5k/pcu.c +++ b/drivers/net/wireless/ath/ath5k/pcu.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "ath5k.h" | 29 | #include "ath5k.h" |
30 | #include "reg.h" | 30 | #include "reg.h" |
31 | #include "debug.h" | 31 | #include "debug.h" |
32 | #include "base.h" | ||
33 | 32 | ||
34 | /* | 33 | /* |
35 | * AR5212+ can use higher rates for ack transmission | 34 | * AR5212+ can use higher rates for ack transmission |
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index 227c914fa79d..01cb72de44cb 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c | |||
@@ -26,9 +26,9 @@ | |||
26 | 26 | ||
27 | #include "ath5k.h" | 27 | #include "ath5k.h" |
28 | #include "reg.h" | 28 | #include "reg.h" |
29 | #include "base.h" | ||
30 | #include "rfbuffer.h" | 29 | #include "rfbuffer.h" |
31 | #include "rfgain.h" | 30 | #include "rfgain.h" |
31 | #include "../regd.h" | ||
32 | 32 | ||
33 | 33 | ||
34 | /******************\ | 34 | /******************\ |
diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c index a8b8ffa7811d..776654228eaa 100644 --- a/drivers/net/wireless/ath/ath5k/qcu.c +++ b/drivers/net/wireless/ath/ath5k/qcu.c | |||
@@ -23,7 +23,6 @@ Queue Control Unit, DFS Control Unit Functions | |||
23 | #include "ath5k.h" | 23 | #include "ath5k.h" |
24 | #include "reg.h" | 24 | #include "reg.h" |
25 | #include "debug.h" | 25 | #include "debug.h" |
26 | #include "base.h" | ||
27 | 26 | ||
28 | 27 | ||
29 | /******************\ | 28 | /******************\ |
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c index 8bc57e457615..2abac257b4b4 100644 --- a/drivers/net/wireless/ath/ath5k/reset.c +++ b/drivers/net/wireless/ath/ath5k/reset.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
31 | #include "ath5k.h" | 31 | #include "ath5k.h" |
32 | #include "reg.h" | 32 | #include "reg.h" |
33 | #include "base.h" | ||
34 | #include "debug.h" | 33 | #include "debug.h" |
35 | 34 | ||
36 | 35 | ||
diff --git a/drivers/net/wireless/ath/ath5k/rfkill.c b/drivers/net/wireless/ath/ath5k/rfkill.c index 945fc9f21e76..270a319f3aeb 100644 --- a/drivers/net/wireless/ath/ath5k/rfkill.c +++ b/drivers/net/wireless/ath/ath5k/rfkill.c | |||
@@ -33,7 +33,7 @@ | |||
33 | * THE POSSIBILITY OF SUCH DAMAGES. | 33 | * THE POSSIBILITY OF SUCH DAMAGES. |
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "base.h" | 36 | #include "ath5k.h" |
37 | 37 | ||
38 | 38 | ||
39 | static inline void ath5k_rfkill_disable(struct ath5k_hw *ah) | 39 | static inline void ath5k_rfkill_disable(struct ath5k_hw *ah) |
diff --git a/drivers/net/wireless/ath/ath5k/sysfs.c b/drivers/net/wireless/ath/ath5k/sysfs.c index 0244a36ba958..9364da7bd131 100644 --- a/drivers/net/wireless/ath/ath5k/sysfs.c +++ b/drivers/net/wireless/ath/ath5k/sysfs.c | |||
@@ -1,7 +1,6 @@ | |||
1 | #include <linux/device.h> | 1 | #include <linux/device.h> |
2 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
3 | 3 | ||
4 | #include "base.h" | ||
5 | #include "ath5k.h" | 4 | #include "ath5k.h" |
6 | #include "reg.h" | 5 | #include "reg.h" |
7 | 6 | ||
diff --git a/drivers/net/wireless/ath/ath5k/trace.h b/drivers/net/wireless/ath/ath5k/trace.h index c741c871f4e9..39f002ed4a88 100644 --- a/drivers/net/wireless/ath/ath5k/trace.h +++ b/drivers/net/wireless/ath/ath5k/trace.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define __TRACE_ATH5K_H | 2 | #define __TRACE_ATH5K_H |
3 | 3 | ||
4 | #include <linux/tracepoint.h> | 4 | #include <linux/tracepoint.h> |
5 | #include "base.h" | ||
6 | 5 | ||
7 | #ifndef CONFIG_ATH5K_TRACER | 6 | #ifndef CONFIG_ATH5K_TRACER |
8 | #undef TRACE_EVENT | 7 | #undef TRACE_EVENT |
@@ -11,6 +10,8 @@ static inline void trace_ ## name(proto) {} | |||
11 | #endif | 10 | #endif |
12 | 11 | ||
13 | struct sk_buff; | 12 | struct sk_buff; |
13 | struct ath5k_txq; | ||
14 | struct ath5k_tx_status; | ||
14 | 15 | ||
15 | #undef TRACE_SYSTEM | 16 | #undef TRACE_SYSTEM |
16 | #define TRACE_SYSTEM ath5k | 17 | #define TRACE_SYSTEM ath5k |