mwifiex: Fixed endianness problem for big endian platform

The driver sends and recives information to and from the firmware.
Correct endianness should be ensured as firmware follows little
endian format and host can be little/big endian.

Signed-off-by: Karthik D A <karthida@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index 5596b6be1898dbfbab10f2af976526dc0a86115a..c46267b964625e78e116bbd2c3fa964388d5a19e 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -1646,7 +1646,7 @@ struct mwifiex_ie_types_sta_info {
 };
 
 struct host_cmd_ds_sta_list {
-       u16 sta_count;
+       __le16 sta_count;
        u8 tlv[0];
 } __packed;
 
@@ -2034,26 +2034,26 @@ struct host_cmd_ds_set_bss_mode {
 
 struct host_cmd_ds_pcie_details {
        /* TX buffer descriptor ring address */
-       u32 txbd_addr_lo;
-       u32 txbd_addr_hi;
+       __le32 txbd_addr_lo;
+       __le32 txbd_addr_hi;
        /* TX buffer descriptor ring count */
-       u32 txbd_count;
+       __le32 txbd_count;
 
        /* RX buffer descriptor ring address */
-       u32 rxbd_addr_lo;
-       u32 rxbd_addr_hi;
+       __le32 rxbd_addr_lo;
+       __le32 rxbd_addr_hi;
        /* RX buffer descriptor ring count */
-       u32 rxbd_count;
+       __le32 rxbd_count;
 
        /* Event buffer descriptor ring address */
-       u32 evtbd_addr_lo;
-       u32 evtbd_addr_hi;
+       __le32 evtbd_addr_lo;
+       __le32 evtbd_addr_hi;
        /* Event buffer descriptor ring count */
-       u32 evtbd_count;
+       __le32 evtbd_count;
 
        /* Sleep cookie buffer physical address */
-       u32 sleep_cookie_addr_lo;
-       u32 sleep_cookie_addr_hi;
+       __le32 sleep_cookie_addr_lo;
+       __le32 sleep_cookie_addr_hi;
 } __packed;
 
 struct mwifiex_ie_types_rssi_threshold {
@@ -2093,8 +2093,8 @@ struct mwifiex_ie_types_mc_group_info {
        u8 chan_buf_weight;
        u8 band_config;
        u8 chan_num;
-       u32 chan_time;
-       u32 reserved;
+       __le32 chan_time;
+       __le32 reserved;
        union {
                u8 sdio_func_num;
                u8 usb_ep_num;
@@ -2185,7 +2185,7 @@ struct host_cmd_ds_robust_coex {
 } __packed;
 
 struct host_cmd_ds_wakeup_reason {
-       u16  wakeup_reason;
+       __le16  wakeup_reason;
 } __packed;
 
 struct host_cmd_ds_gtk_rekey_params {

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
index 7897037b0992bc34e7212962c7e98c7d936ca50d..108c11cc0c16ad77cdd7673d39a0f6088c3f7a1c 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmd.c
@@ -1244,20 +1244,23 @@ mwifiex_cmd_pcie_host_spec(struct mwifiex_private *priv,
                return 0;
 
        /* Send the ring base addresses and count to firmware */
-       host_spec->txbd_addr_lo = (u32)(card->txbd_ring_pbase);
-       host_spec->txbd_addr_hi = (u32)(((u64)card->txbd_ring_pbase)>>32);
-       host_spec->txbd_count = MWIFIEX_MAX_TXRX_BD;
-       host_spec->rxbd_addr_lo = (u32)(card->rxbd_ring_pbase);
-       host_spec->rxbd_addr_hi = (u32)(((u64)card->rxbd_ring_pbase)>>32);
-       host_spec->rxbd_count = MWIFIEX_MAX_TXRX_BD;
-       host_spec->evtbd_addr_lo = (u32)(card->evtbd_ring_pbase);
-       host_spec->evtbd_addr_hi = (u32)(((u64)card->evtbd_ring_pbase)>>32);
-       host_spec->evtbd_count = MWIFIEX_MAX_EVT_BD;
+       host_spec->txbd_addr_lo = cpu_to_le32((u32)(card->txbd_ring_pbase));
+       host_spec->txbd_addr_hi =
+                       cpu_to_le32((u32)(((u64)card->txbd_ring_pbase) >> 32));
+       host_spec->txbd_count = cpu_to_le32(MWIFIEX_MAX_TXRX_BD);
+       host_spec->rxbd_addr_lo = cpu_to_le32((u32)(card->rxbd_ring_pbase));
+       host_spec->rxbd_addr_hi =
+                       cpu_to_le32((u32)(((u64)card->rxbd_ring_pbase) >> 32));
+       host_spec->rxbd_count = cpu_to_le32(MWIFIEX_MAX_TXRX_BD);
+       host_spec->evtbd_addr_lo = cpu_to_le32((u32)(card->evtbd_ring_pbase));
+       host_spec->evtbd_addr_hi =
+                       cpu_to_le32((u32)(((u64)card->evtbd_ring_pbase) >> 32));
+       host_spec->evtbd_count = cpu_to_le32(MWIFIEX_MAX_EVT_BD);
        if (card->sleep_cookie_vbase) {
                host_spec->sleep_cookie_addr_lo =
-                                               (u32)(card->sleep_cookie_pbase);
-               host_spec->sleep_cookie_addr_hi =
-                                (u32)(((u64)(card->sleep_cookie_pbase)) >> 32);
+                               cpu_to_le32((u32)(card->sleep_cookie_pbase));
+               host_spec->sleep_cookie_addr_hi = cpu_to_le32((u32)(((u64)
+                                       (card->sleep_cookie_pbase)) >> 32));
                mwifiex_dbg(priv->adapter, INFO,
                            "sleep_cook_lo phy addr: 0x%x\n",
                            host_spec->sleep_cookie_addr_lo);

diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index ccf54932e32185ec5508306c954b1a7fc8fe3416..90e191bf1343a1c71c0e266bf8a3c9efddf9cc39 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -962,7 +962,7 @@ static int mwifiex_ret_uap_sta_list(struct mwifiex_private *priv,
        int i;
        struct mwifiex_sta_node *sta_node;
 
-       for (i = 0; i < sta_list->sta_count; i++) {
+       for (i = 0; i < (le16_to_cpu(sta_list->sta_count)); i++) {
                sta_node = mwifiex_get_sta_entry(priv, sta_info->mac);
                if (unlikely(!sta_node))
                        continue;