ath5k: fix mac address detection on dual-radio ar5312
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 472-ath_unshare_bus_ops.patch
1 --- a/drivers/net/wireless/ath/ath.h
2 +++ b/drivers/net/wireless/ath/ath.h
3 @@ -123,14 +123,7 @@ struct ath_ops {
4 };
5
6 struct ath_common;
7 -
8 -struct ath_bus_ops {
9 - enum ath_bus_type ath_bus_type;
10 - void (*read_cachesize)(struct ath_common *common, int *csz);
11 - bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
12 - void (*bt_coex_prep)(struct ath_common *common);
13 - void (*extn_synch_en)(struct ath_common *common);
14 -};
15 +struct ath_bus_ops;
16
17 struct ath_common {
18 void *ah;
19 --- a/drivers/net/wireless/ath/ath9k/hw.h
20 +++ b/drivers/net/wireless/ath/ath9k/hw.h
21 @@ -847,6 +847,14 @@ struct ath_hw {
22 u32 ent_mode;
23 };
24
25 +struct ath_bus_ops {
26 + enum ath_bus_type ath_bus_type;
27 + void (*read_cachesize)(struct ath_common *common, int *csz);
28 + bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
29 + void (*bt_coex_prep)(struct ath_common *common);
30 + void (*extn_synch_en)(struct ath_common *common);
31 +};
32 +
33 static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
34 {
35 return &ah->common;
36 --- a/drivers/net/wireless/ath/ath5k/ath5k.h
37 +++ b/drivers/net/wireless/ath/ath5k/ath5k.h
38 @@ -1155,6 +1155,12 @@ struct ath5k_hw {
39 struct ath5k_rx_status *);
40 };
41
42 +struct ath_bus_ops {
43 + enum ath_bus_type ath_bus_type;
44 + void (*read_cachesize)(struct ath_common *common, int *csz);
45 + bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
46 +};
47 +
48 /*
49 * Prototypes
50 */