Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux...

[cascardo/linux.git] / drivers / net / wireless / ath / ath.h

diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index 86907e5..ccba4fe 100644 (file)
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -135,6 +135,11 @@ struct ath_ops {
 struct ath_common;
 struct ath_bus_ops;
 
+struct ath_ps_ops {
+       void (*wakeup)(struct ath_common *common);
+       void (*restore)(struct ath_common *common);
+};
+
 struct ath_common {
        void *ah;
        void *priv;
@@ -148,7 +153,7 @@ struct ath_common {
        u16 cachelsz;
        u16 curaid;
        u8 macaddr[ETH_ALEN];
-       u8 curbssid[ETH_ALEN];
+       u8 curbssid[ETH_ALEN] __aligned(2);
        u8 bssidmask[ETH_ALEN];
 
        u32 rx_bufsize;
@@ -169,6 +174,7 @@ struct ath_common {
        struct ath_regulatory reg_world_copy;
        const struct ath_ops *ops;
        const struct ath_bus_ops *bus_ops;
+       const struct ath_ps_ops *ps_ops;
 
        bool btcoex_enabled;
        bool disable_ani;
@@ -178,6 +184,11 @@ struct ath_common {
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
 };
 
+static inline const struct ath_ps_ops *ath_ps_ops(struct ath_common *common)
+{
+       return common->ps_ops;
+}
+
 struct sk_buff *ath_rxbuf_alloc(struct ath_common *common,
                                u32 len,
                                gfp_t gfp_mask);