mac80211: merge latest changes from trunk, fixes #9227

[openwrt-10.03/.git] / package / mac80211 / patches / 472-ath_unshare_bus_ops.patch

diff --git a/package/mac80211/patches/472-ath_unshare_bus_ops.patch b/package/mac80211/patches/472-ath_unshare_bus_ops.patch
new file mode 100644 (file)
index 0000000..b3b0eab
--- /dev/null
+++ b/package/mac80211/patches/472-ath_unshare_bus_ops.patch
@@ -0,0 +1,50 @@
+--- a/drivers/net/wireless/ath/ath.h
++++ b/drivers/net/wireless/ath/ath.h
+@@ -123,14 +123,7 @@ struct ath_ops {
+ };
+ 
+ struct ath_common;
+-
+-struct ath_bus_ops {
+-      enum ath_bus_type ath_bus_type;
+-      void (*read_cachesize)(struct ath_common *common, int *csz);
+-      bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
+-      void (*bt_coex_prep)(struct ath_common *common);
+-      void (*extn_synch_en)(struct ath_common *common);
+-};
++struct ath_bus_ops;
+ 
+ struct ath_common {
+       void *ah;
+--- a/drivers/net/wireless/ath/ath9k/hw.h
++++ b/drivers/net/wireless/ath/ath9k/hw.h
+@@ -847,6 +847,14 @@ struct ath_hw {
+       u32 ent_mode;
+ };
+ 
++struct ath_bus_ops {
++      enum ath_bus_type ath_bus_type;
++      void (*read_cachesize)(struct ath_common *common, int *csz);
++      bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
++      void (*bt_coex_prep)(struct ath_common *common);
++      void (*extn_synch_en)(struct ath_common *common);
++};
++
+ static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
+ {
+       return &ah->common;
+--- a/drivers/net/wireless/ath/ath5k/ath5k.h
++++ b/drivers/net/wireless/ath/ath5k/ath5k.h
+@@ -1155,6 +1155,12 @@ struct ath5k_hw {
+               struct ath5k_rx_status *);
+ };
+ 
++struct ath_bus_ops {
++      enum ath_bus_type ath_bus_type;
++      void (*read_cachesize)(struct ath_common *common, int *csz);
++      bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
++};
++
+ /*
+  * Prototypes
+  */