staging: wlan-ng: Fix the types of the hfa384x_comm_tallies_16/32 members

Running sparse revealed that the members of hfa384x_comm_tallies_16/32
were defined as u16/u32, but were actually used as __le16/__le32.

This patch changes the member types to reflect their use.

Signed-off-by: Christopher H Pezley <chris@pezley.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h
index 3b18e57b4ab93ceb40c03751f4445de0ea3ecc5f..cb5afeffb234613b669805807b0ffbdf021938cb 100644 (file)
--- a/drivers/staging/wlan-ng/hfa384x.h
+++ b/drivers/staging/wlan-ng/hfa384x.h
@@ -598,51 +598,51 @@ struct hfa384x_rx_frame {
 
 /*--  Inquiry Frame, Diagnose: Communication Tallies --*/
 struct hfa384x_comm_tallies_16 {
-       u16 txunicastframes;
-       u16 txmulticastframes;
-       u16 txfragments;
-       u16 txunicastoctets;
-       u16 txmulticastoctets;
-       u16 txdeferredtrans;
-       u16 txsingleretryframes;
-       u16 txmultipleretryframes;
-       u16 txretrylimitexceeded;
-       u16 txdiscards;
-       u16 rxunicastframes;
-       u16 rxmulticastframes;
-       u16 rxfragments;
-       u16 rxunicastoctets;
-       u16 rxmulticastoctets;
-       u16 rxfcserrors;
-       u16 rxdiscardsnobuffer;
-       u16 txdiscardswrongsa;
-       u16 rxdiscardswepundecr;
-       u16 rxmsginmsgfrag;
-       u16 rxmsginbadmsgfrag;
+       __le16 txunicastframes;
+       __le16 txmulticastframes;
+       __le16 txfragments;
+       __le16 txunicastoctets;
+       __le16 txmulticastoctets;
+       __le16 txdeferredtrans;
+       __le16 txsingleretryframes;
+       __le16 txmultipleretryframes;
+       __le16 txretrylimitexceeded;
+       __le16 txdiscards;
+       __le16 rxunicastframes;
+       __le16 rxmulticastframes;
+       __le16 rxfragments;
+       __le16 rxunicastoctets;
+       __le16 rxmulticastoctets;
+       __le16 rxfcserrors;
+       __le16 rxdiscardsnobuffer;
+       __le16 txdiscardswrongsa;
+       __le16 rxdiscardswepundecr;
+       __le16 rxmsginmsgfrag;
+       __le16 rxmsginbadmsgfrag;
 } __packed;
 
 struct hfa384x_comm_tallies_32 {
-       u32 txunicastframes;
-       u32 txmulticastframes;
-       u32 txfragments;
-       u32 txunicastoctets;
-       u32 txmulticastoctets;
-       u32 txdeferredtrans;
-       u32 txsingleretryframes;
-       u32 txmultipleretryframes;
-       u32 txretrylimitexceeded;
-       u32 txdiscards;
-       u32 rxunicastframes;
-       u32 rxmulticastframes;
-       u32 rxfragments;
-       u32 rxunicastoctets;
-       u32 rxmulticastoctets;
-       u32 rxfcserrors;
-       u32 rxdiscardsnobuffer;
-       u32 txdiscardswrongsa;
-       u32 rxdiscardswepundecr;
-       u32 rxmsginmsgfrag;
-       u32 rxmsginbadmsgfrag;
+       __le32 txunicastframes;
+       __le32 txmulticastframes;
+       __le32 txfragments;
+       __le32 txunicastoctets;
+       __le32 txmulticastoctets;
+       __le32 txdeferredtrans;
+       __le32 txsingleretryframes;
+       __le32 txmultipleretryframes;
+       __le32 txretrylimitexceeded;
+       __le32 txdiscards;
+       __le32 rxunicastframes;
+       __le32 rxmulticastframes;
+       __le32 rxfragments;
+       __le32 rxunicastoctets;
+       __le32 rxmulticastoctets;
+       __le32 rxfcserrors;
+       __le32 rxdiscardsnobuffer;
+       __le32 txdiscardswrongsa;
+       __le32 rxdiscardswepundecr;
+       __le32 rxmsginmsgfrag;
+       __le32 rxmsginbadmsgfrag;
 } __packed;
 
 /*--  Inquiry Frame, Diagnose: Scan Results & Subfields--*/

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 250af0de9c3e51a7b4b85a76b9580ad6d6493cd7..8c347128e8109d66e2cb7042e27f51fd3a93b047 100644 (file)
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -991,9 +991,9 @@ static void prism2sta_inf_tallies(struct wlandevice *wlandev,
                                  struct hfa384x_inf_frame *inf)
 {
        struct hfa384x *hw = wlandev->priv;
-       u16 *src16;
+       __le16 *src16;
        u32 *dst;
-       u32 *src32;
+       __le32 *src32;
        int i;
        int cnt;
 
@@ -1005,12 +1005,12 @@ static void prism2sta_inf_tallies(struct wlandevice *wlandev,
        cnt = sizeof(struct hfa384x_comm_tallies_32) / sizeof(u32);
        if (inf->framelen > 22) {
                dst = (u32 *)&hw->tallies;
-               src32 = (u32 *)&inf->info.commtallies32;
+               src32 = (__le32 *)&inf->info.commtallies32;
                for (i = 0; i < cnt; i++, dst++, src32++)
                        *dst += le32_to_cpu(*src32);
        } else {
                dst = (u32 *)&hw->tallies;
-               src16 = (u16 *)&inf->info.commtallies16;
+               src16 = (__le16 *)&inf->info.commtallies16;
                for (i = 0; i < cnt; i++, dst++, src16++)
                        *dst += le16_to_cpu(*src16);
        }