ath9k_htc: Fix sparse endian warnings

This patch fixes a bunch of endian issues that
were exposed by sparse. It's a miracle that the driver
worked at all till now.

The Lord be praised.

Signed-off-by: Sujith <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 6a4614a8701b913a433a28c18445c01699cf5b1b..c765ff4a505c54ea265b423c83d3dc1b752ddb3d 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -124,13 +124,13 @@ struct ath9k_htc_cap_target {
 struct ath9k_htc_target_vif {
        u8 index;
        u8 des_bssid[ETH_ALEN];
-       enum htc_opmode opmode;
+       __be32 opmode;
        u8 myaddr[ETH_ALEN];
        u8 bssid[ETH_ALEN];
        u32 flags;
        u32 flags_ext;
        u16 ps_sta;
-       u16 rtsthreshold;
+       __be16 rtsthreshold;
        u8 ath_cap;
        u8 node;
        s8 mcast_rate;
@@ -151,7 +151,7 @@ struct ath9k_htc_target_sta {
        u8 sta_index;
        u8 vif_index;
        u8 vif_sta;
-       u16 flags; /* ATH_HTC_STA_* */
+       __be16 flags; /* ATH_HTC_STA_* */
        u16 htcap;
        u8 valid;
        u16 capinfo;
@@ -191,16 +191,16 @@ struct ath9k_htc_rate {
 struct ath9k_htc_target_rate {
        u8 sta_index;
        u8 isnew;
-       u32 capflags;
+       __be32 capflags;
        struct ath9k_htc_rate rates;
 };
 
 struct ath9k_htc_target_stats {
-       u32 tx_shortretry;
-       u32 tx_longretry;
-       u32 tx_xretries;
-       u32 ht_txunaggr_xretry;
-       u32 ht_tx_xretries;
+       __be32 tx_shortretry;
+       __be32 tx_longretry;
+       __be32 tx_xretries;
+       __be32 ht_txunaggr_xretry;
+       __be32 ht_tx_xretries;
 } __packed;
 
 struct ath9k_htc_vif {

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index d10402864b7603fbddc1cfebfcdf9ebfd1fa9c9f..7cb55f5b071c76be349ace16e4f25f6a5d8d812b 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -26,7 +26,8 @@ static void ath9k_htc_beacon_config_sta(struct ath9k_htc_priv *priv,
        enum ath9k_int imask = 0;
        int dtimperiod, dtimcount, sleepduration;
        int cfpperiod, cfpcount, bmiss_timeout;
-       u32 nexttbtt = 0, intval, tsftu, htc_imask = 0;
+       u32 nexttbtt = 0, intval, tsftu;
+       __be32 htc_imask = 0;
        u64 tsf;
        int num_beacons, offset, dtim_dec_count, cfp_dec_count;
        int ret;
@@ -142,7 +143,8 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
 {
        struct ath_common *common = ath9k_hw_common(priv->ah);
        enum ath9k_int imask = 0;
-       u32 nexttbtt, intval, htc_imask = 0;
+       u32 nexttbtt, intval;
+       __be32 htc_imask = 0;
        int ret;
        u8 cmd_rsp;
 

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 081f44504285788a776a1236027a5dd373028564..ec7bcc8696ecf257f420085b16f75c8560be75ef 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -125,7 +125,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv,
        bool fastcc = true;
        struct ieee80211_channel *channel = hw->conf.channel;
        enum htc_phymode mode;
-       u16 htc_mode;
+       __be16 htc_mode;
        u8 cmd_rsp;
        int ret;
 
@@ -378,7 +378,7 @@ static int ath9k_htc_init_rate(struct ath9k_htc_priv *priv,
        priv->tgt_rate.sta_index = ista->index;
        priv->tgt_rate.isnew = 1;
        trate = priv->tgt_rate;
-       priv->tgt_rate.capflags = caps;
+       priv->tgt_rate.capflags = cpu_to_be32(caps);
        trate.capflags = cpu_to_be32(caps);
 
        WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, &trate);
@@ -426,6 +426,7 @@ static void ath9k_htc_rc_update(struct ath9k_htc_priv *priv, bool is_cw40)
        struct ath9k_htc_target_rate trate;
        struct ath_common *common = ath9k_hw_common(priv->ah);
        int ret;
+       u32 caps = be32_to_cpu(priv->tgt_rate.capflags);
        u8 cmd_rsp;
 
        memset(&trate, 0, sizeof(trate));
@@ -433,11 +434,12 @@ static void ath9k_htc_rc_update(struct ath9k_htc_priv *priv, bool is_cw40)
        trate = priv->tgt_rate;
 
        if (is_cw40)
-               priv->tgt_rate.capflags |= WLAN_RC_40_FLAG;
+               caps |= WLAN_RC_40_FLAG;
        else
-               priv->tgt_rate.capflags &= ~WLAN_RC_40_FLAG;
+               caps &= ~WLAN_RC_40_FLAG;
 
-       trate.capflags = cpu_to_be32(priv->tgt_rate.capflags);
+       priv->tgt_rate.capflags = cpu_to_be32(caps);
+       trate.capflags = cpu_to_be32(caps);
 
        WMI_CMD_BUF(WMI_RC_RATE_UPDATE_CMDID, &trate);
        if (ret) {
@@ -1104,7 +1106,7 @@ static int ath9k_htc_start(struct ieee80211_hw *hw)
        struct ath9k_channel *init_channel;
        int ret = 0;
        enum htc_phymode mode;
-       u16 htc_mode;
+       __be16 htc_mode;
        u8 cmd_rsp;
 
        ath_print(common, ATH_DBG_CONFIG,

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
index 0a7cb30af5b480c05f247fde51c102dea1d02d8c..2c3c51007dd362908ac8e0ec60191ef718c67277 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -530,7 +530,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv,
                        priv->ah->stats.avgbrssi = rxbuf->rxstatus.rs_rssi;
        }
 
-       rx_status->mactime = rxbuf->rxstatus.rs_tstamp;
+       rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp);
        rx_status->band = hw->conf.channel->band;
        rx_status->freq = hw->conf.channel->center_freq;
        rx_status->signal =  rxbuf->rxstatus.rs_rssi + ATH_DEFAULT_NOISE_FLOOR;
@@ -634,13 +634,8 @@ void ath9k_htc_rxep(void *drv_priv, struct sk_buff *skb,
 
        rxstatus = (struct ath_htc_rx_status *)skb->data;
 
-       rxstatus->rs_tstamp = be64_to_cpu(rxstatus->rs_tstamp);
-       rxstatus->rs_datalen = be16_to_cpu(rxstatus->rs_datalen);
-       rxstatus->evm0 = be32_to_cpu(rxstatus->evm0);
-       rxstatus->evm1 = be32_to_cpu(rxstatus->evm1);
-       rxstatus->evm2 = be32_to_cpu(rxstatus->evm2);
-
-       if (rxstatus->rs_datalen - (len - HTC_RX_FRAME_HEADER_SIZE) != 0) {
+       if (be16_to_cpu(rxstatus->rs_datalen) -
+           (len - HTC_RX_FRAME_HEADER_SIZE) != 0) {
                ath_print(common, ATH_DBG_FATAL,
                          "Corrupted RX data len, dropping "
                          "(epid: %d, dlen: %d, skblen: %d)\n",

diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 587d98ed098903bd85e9c45acc13e468d70c7b23..f2dca258bdc2b520b8aedd66e87a15f0baf556f5 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -368,7 +368,7 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle,
        struct htc_frame_hdr *htc_hdr;
        enum htc_endpoint_id epid;
        struct htc_endpoint *endpoint;
-       u16 *msg_id;
+       __be16 *msg_id;
 
        if (!htc_handle || !skb)
                return;
@@ -388,14 +388,14 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle,
 
                /* Handle trailer */
                if (htc_hdr->flags & HTC_FLAGS_RECV_TRAILER) {
-                       if (be32_to_cpu(*(u32 *) skb->data) == 0x00C60000)
+                       if (be32_to_cpu(*(__be32 *) skb->data) == 0x00C60000)
                                /* Move past the Watchdog pattern */
                                htc_hdr = (struct htc_frame_hdr *)(skb->data + 4);
                }
 
                /* Get the message ID */
-               msg_id = (u16 *) ((void *) htc_hdr +
-                                          sizeof(struct htc_frame_hdr));
+               msg_id = (__be16 *) ((void *) htc_hdr +
+                                    sizeof(struct htc_frame_hdr));
 
                /* Now process HTC messages */
                switch (be16_to_cpu(*msg_id)) {

diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.h b/drivers/net/wireless/ath/ath9k/htc_hst.h
index cd7048ffd2396909efb80b64b5f5d280aafdc478..ea50ab032d205fa92c62aba023e540b64a4ee3ad 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_hst.h
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.h
@@ -59,20 +59,20 @@ enum htc_endpoint_id {
 struct htc_frame_hdr {
        u8 endpoint_id;
        u8 flags;
-       u16 payload_len;
+       __be16 payload_len;
        u8 control[4];
 } __packed;
 
 struct htc_ready_msg {
-       u16 message_id;
-       u16 credits;
-       u16 credit_size;
+       __be16 message_id;
+       __be16 credits;
+       __be16 credit_size;
        u8 max_endpoints;
        u8 pad;
 } __packed;
 
 struct htc_config_pipe_msg {
-       u16 message_id;
+       __be16 message_id;
        u8 pipe_id;
        u8 credits;
 } __packed;
@@ -192,9 +192,9 @@ enum htc_service_group_ids{
 #define WMI_DATA_BK_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP, 8)
 
 struct htc_conn_svc_msg {
-       u16 msg_id;
-       u16 service_id;
-       u16 con_flags;
+       __be16 msg_id;
+       __be16 service_id;
+       __be16 con_flags;
        u8 dl_pipeid;
        u8 ul_pipeid;
        u8 svc_meta_len;
@@ -209,17 +209,17 @@ struct htc_conn_svc_msg {
 #define HTC_SERVICE_NO_MORE_EP   4
 
 struct htc_conn_svc_rspmsg {
-       u16 msg_id;
-       u16 service_id;
+       __be16 msg_id;
+       __be16 service_id;
        u8 status;
        u8 endpoint_id;
-       u16 max_msg_len;
+       __be16 max_msg_len;
        u8 svc_meta_len;
        u8 pad;
 } __packed;
 
 struct htc_comp_msg {
-       u16 msg_id;
+       __be16 msg_id;
 } __packed;
 
 int htc_init(struct htc_target *target);

diff --git a/drivers/net/wireless/ath/ath9k/mac.h b/drivers/net/wireless/ath/ath9k/mac.h
index 68eb8d0b92eb3f933b38b35c83bf89f139a61409..66d0d5e56149319b0b1205d1d89b9e07173cede9 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/mac.h
+++ b/drivers/net/wireless/ath/ath9k/mac.h
@@ -155,8 +155,8 @@ struct ath_rx_status {
 };
 
 struct ath_htc_rx_status {
-       u64 rs_tstamp;
-       u16 rs_datalen;
+       __be64 rs_tstamp;
+       __be16 rs_datalen;
        u8 rs_status;
        u8 rs_phyerr;
        int8_t rs_rssi;
@@ -175,9 +175,9 @@ struct ath_htc_rx_status {
        u8 rs_num_delims;
        u8 rs_flags;
        u8 rs_dummy;
-       u32 evm0;
-       u32 evm1;
-       u32 evm2;
+       __be32 evm0;
+       __be32 evm1;
+       __be32 evm2;
 };
 
 #define ATH9K_RXERR_CRC           0x01

diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c
index afbf63daf5519eae640be49c5cc9259588c384ae..dc6c6fc2e095bcdf8d01a3eaaf55b5957ecb5e97 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/wmi.c
+++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -129,7 +129,7 @@ void ath9k_wmi_tasklet(unsigned long data)
        void *wmi_event;
        unsigned long flags;
 #ifdef CONFIG_ATH9K_HTC_DEBUGFS
-       u32 txrate;
+       __be32 txrate;
 #endif
 
        spin_lock_irqsave(&priv->wmi->wmi_lock, flags);

diff --git a/drivers/net/wireless/ath/ath9k/wmi.h b/drivers/net/wireless/ath/ath9k/wmi.h
index 611357158ecfb1ca3a1fe5c0dff3f326dbb442b7..167e15c500627426ff46d21752c9dae8e30a2104 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/wmi.h
+++ b/drivers/net/wireless/ath/ath9k/wmi.h
@@ -19,7 +19,7 @@
 
 
 struct wmi_event_txrate {
-       u32 txrate;
+       __be32 txrate;
        struct {
                u8 rssi_thresh;
                u8 per;
@@ -27,8 +27,8 @@ struct wmi_event_txrate {
 } __packed;
 
 struct wmi_cmd_hdr {
-       u16 command_id;
-       u16 seq_no;
+       __be16 command_id;
+       __be16 seq_no;
 } __packed;
 
 struct wmi_swba {
@@ -87,8 +87,8 @@ enum wmi_event_id {
 #define MAX_CMD_NUMBER 62
 
 struct register_write {
-       u32 reg;
-       u32 val;
+       __be32 reg;
+       __be32 val;
 };
 
 struct wmi {