3 files changed, 24 insertions, 20 deletions

diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index bac58ed03e5..de5e8f44b20 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -149,7 +149,8 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                 u32 code = le32_to_cpu(bootrec->code);
                 switch (code) {
                 case BR_CODE_COMPONENT_ID:
-                        priv->fw_interface = be32_to_cpup(bootrec->data);
+                        priv->fw_interface = be32_to_cpup((__be32 *)
+                                             bootrec->data);
                         switch (priv->fw_interface) {
                         case FW_FMAC:
                                 printk(KERN_INFO "p54: FreeMAC firmware\n");
@@ -181,9 +182,8 @@ int p54_parse_firmware(struct ieee80211_hw *dev, const struct firmware *fw)
                         priv->rx_end = le32_to_cpu(desc->rx_end) - 0x3500;
                         priv->headroom = desc->headroom;
                         priv->tailroom = desc->tailroom;
-                        if (bootrec->len == 11)
-                                priv->rx_mtu = (size_t) le16_to_cpu(
-                                        (__le16)bootrec->data[10]);
+                        if (le32_to_cpu(bootrec->len) == 11)
+                                priv->rx_mtu = le16_to_cpu(bootrec->rx_mtu);
                         else
                                 priv->rx_mtu = (size_t)
                                         0x620 - priv->tx_hdr_len;
@@ -306,11 +306,11 @@ static int p54_convert_rev1(struct ieee80211_hw *dev,
         return 0;
 }
 
-const char* p54_rf_chips[] = { "NULL", "Indigo?", "Duette",
+static const char *p54_rf_chips[] = { "NULL", "Indigo?", "Duette",
                               "Frisbee", "Xbow", "Longbow" };
 static int p54_init_xbow_synth(struct ieee80211_hw *dev);
 
-int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
+static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
 {
         struct p54_common *priv = dev->priv;
         struct eeprom_pda_wrap *wrap = NULL;
@@ -617,7 +617,7 @@ static void p54_rx_eeprom_readback(struct ieee80211_hw *dev,
         if (!priv->eeprom)
                 return ;
 
-        memcpy(priv->eeprom, eeprom->data, eeprom->len);
+        memcpy(priv->eeprom, eeprom->data, le16_to_cpu(eeprom->len));
 
         complete(&priv->eeprom_comp);
 }
@@ -777,8 +777,9 @@ int p54_read_eeprom(struct ieee80211_hw *dev)
                 hdr->len = cpu_to_le16(blocksize + sizeof(*eeprom_hdr));
                 eeprom_hdr->offset = cpu_to_le16(offset);
                 eeprom_hdr->len = cpu_to_le16(blocksize);
-                p54_assign_address(dev, NULL, hdr, hdr->len + sizeof(*hdr));
-                priv->tx(dev, hdr, hdr->len + sizeof(*hdr), 0);
+                p54_assign_address(dev, NULL, hdr, le16_to_cpu(hdr->len) +
+                                   sizeof(*hdr));
+                priv->tx(dev, hdr, le16_to_cpu(hdr->len) + sizeof(*hdr), 0);
 
                 if (!wait_for_completion_interruptible_timeout(&priv->eeprom_comp, HZ)) {
                         printk(KERN_ERR "%s: device does not respond!\n",
@@ -1247,18 +1248,20 @@ static void p54_configure_filter(struct ieee80211_hw *dev,
 
         if (changed_flags & FIF_BCN_PRBRESP_PROMISC) {
                 if (*total_flags & FIF_BCN_PRBRESP_PROMISC)
-                        p54_set_filter(dev, priv->filter_type, NULL);
+                        p54_set_filter(dev, le16_to_cpu(priv->filter_type),
+                                 NULL);
                 else
-                        p54_set_filter(dev, priv->filter_type, priv->bssid);
+                        p54_set_filter(dev, le16_to_cpu(priv->filter_type),
+                                 priv->bssid);
         }
 
         if (changed_flags & FIF_PROMISC_IN_BSS) {
                 if (*total_flags & FIF_PROMISC_IN_BSS)
-                        p54_set_filter(dev, priv->filter_type |
-                                cpu_to_le16(0x8), NULL);
+                        p54_set_filter(dev, le16_to_cpu(priv->filter_type) |
+                                0x8, NULL);
                 else
-                        p54_set_filter(dev, priv->filter_type &
-                                ~cpu_to_le16(0x8), priv->bssid);
+                        p54_set_filter(dev, le16_to_cpu(priv->filter_type) &
+                                ~0x8, priv->bssid);
         }
 }
 
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h
index 4da736c789a..2fa994cfcfe 100644
--- a/drivers/net/wireless/p54/p54common.h
+++ b/drivers/net/wireless/p54/p54common.h
@@ -18,7 +18,8 @@
 struct bootrec {
         __le32 code;
         __le32 len;
-        u32 data[0];
+        u32 data[10];
+        __le16 rx_mtu;
 } __attribute__((packed));
 
 struct bootrec_exp_if {
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 7444f372977..1912f5e9a0a 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -218,17 +218,17 @@ static void p54u_tx_3887(struct ieee80211_hw *dev, struct p54_control_hdr *data,
         usb_submit_urb(data_urb, GFP_ATOMIC);
 }
 
-__le32 p54u_lm87_chksum(const u32 *data, size_t length)
+static __le32 p54u_lm87_chksum(const u32 *data, size_t length)
 {
-        __le32 chk = 0;
+        u32 chk = 0;
 
         length >>= 2;
         while (length--) {
-                chk ^= cpu_to_le32(*data++);
+                chk ^= *data++;
                 chk = (chk >> 5) ^ (chk << 3);
         }
 
-        return chk;
+        return cpu_to_le32(chk);
 }
 
 static void p54u_tx_lm87(struct ieee80211_hw *dev,