ath9k_htc: Sync struct ath9k_htc_target_vif with FW

Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index e096624d9073119a0264b74b1d4fa8b64de9cd3e..f74f45f238af1f110c1f9fa8707c9049566cb34c 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -117,17 +117,11 @@ struct ath9k_htc_cap_target {
 
 struct ath9k_htc_target_vif {
        u8 index;
-       u8 des_bssid[ETH_ALEN];
-       __be32 opmode;
+       u8 opmode;
        u8 myaddr[ETH_ALEN];
-       u8 bssid[ETH_ALEN];
-       u32 flags;
-       u32 flags_ext;
-       u16 ps_sta;
-       __be16 rtsthreshold;
        u8 ath_cap;
-       u8 node;
-       s8 mcast_rate;
+       __be16 rtsthreshold;
+       u8 pad;
 } __packed;
 
 #define ATH_HTC_STA_AUTH  0x0001

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 9bb20f33638c5bfc175eed68d5b74c5eec39d056..400226702e0a53d0e904e2909a4bc2e6079e626d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -349,7 +349,7 @@ static int ath9k_htc_add_monitor_interface(struct ath9k_htc_priv *priv)
        memset(&hvif, 0, sizeof(struct ath9k_htc_target_vif));
        memcpy(&hvif.myaddr, common->macaddr, ETH_ALEN);
 
-       hvif.opmode = cpu_to_be32(HTC_M_MONITOR);
+       hvif.opmode = HTC_M_MONITOR;
        hvif.index = ffz(priv->vif_slot);
 
        WMI_CMD_BUF(WMI_VAP_CREATE_CMDID, &hvif);
@@ -1039,13 +1039,13 @@ static int ath9k_htc_add_interface(struct ieee80211_hw *hw,
 
        switch (vif->type) {
        case NL80211_IFTYPE_STATION:
-               hvif.opmode = cpu_to_be32(HTC_M_STA);
+               hvif.opmode = HTC_M_STA;
                break;
        case NL80211_IFTYPE_ADHOC:
-               hvif.opmode = cpu_to_be32(HTC_M_IBSS);
+               hvif.opmode = HTC_M_IBSS;
                break;
        case NL80211_IFTYPE_AP:
-               hvif.opmode = cpu_to_be32(HTC_M_HOSTAP);
+               hvif.opmode = HTC_M_HOSTAP;
                break;
        default:
                ath_err(common,