misc wireless annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

6 files changed, 25 insertions, 25 deletions

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 5bf7913aadda..14d90a9409aa 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -104,7 +104,7 @@ static int adm8211_read_eeprom(struct ieee80211_hw *dev)
         if (!priv->eeprom)
                 return -ENOMEM;
 
-        eeprom_93cx6_multiread(&eeprom, 0, (__le16 __force *)priv->eeprom, words);
+        eeprom_93cx6_multiread(&eeprom, 0, (__le16 *)priv->eeprom, words);
 
         cr49 = le16_to_cpu(priv->eeprom->cr49);
         priv->rf_type = (cr49 >> 3) & 0x7;
@@ -1867,9 +1867,9 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
                 goto err_iounmap;
         }
 
-        *(u32 *)perm_addr = le32_to_cpu((__force __le32)ADM8211_CSR_READ(PAR0));
-        *(u16 *)&perm_addr[4] =
-                le16_to_cpu((__force __le16)ADM8211_CSR_READ(PAR1) & 0xFFFF);
+        *(__le32 *)perm_addr = cpu_to_le32(ADM8211_CSR_READ(PAR0));
+        *(__le16 *)&perm_addr[4] =
+                cpu_to_le16(ADM8211_CSR_READ(PAR1) & 0xFFFF);
 
         if (!is_valid_ether_addr(perm_addr)) {
                 printk(KERN_WARNING "%s (adm8211): Invalid hwaddr in EEPROM!\n",
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 32fbaf20d272..63ec7a70ee76 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -2675,9 +2675,9 @@ static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 }
 
 struct auth_body {
-        u16 alg;
-        u16 trans_seq;
-        u16 status;
+        __le16 alg;
+        __le16 trans_seq;
+        __le16 status;
         u8 el_id;
         u8 chall_text_len;
         u8 chall_text[253];
@@ -2712,9 +2712,9 @@ static void atmel_scan(struct atmel_private *priv, int specific_ssid)
                 u8 SSID[MAX_SSID_LENGTH];
                 u8 scan_type;
                 u8 channel;
-                u16 BSS_type;
-                u16 min_channel_time;
-                u16 max_channel_time;
+                __le16 BSS_type;
+                __le16 min_channel_time;
+                __le16 max_channel_time;
                 u8 options;
                 u8 SSID_size;
         } cmd;
@@ -2757,7 +2757,7 @@ static void join(struct atmel_private *priv, int type)
                 u8 SSID[MAX_SSID_LENGTH];
                 u8 BSS_type; /* this is a short in a scan command - weird */
                 u8 channel;
-                u16 timeout;
+                __le16 timeout;
                 u8 SSID_size;
                 u8 reserved;
         } cmd;
@@ -2862,8 +2862,8 @@ static void send_association_request(struct atmel_private *priv, int is_reassoc)
         int bodysize;
         struct ieee80211_hdr_4addr header;
         struct ass_req_format {
-                u16 capability;
-                u16 listen_interval;
+                __le16 capability;
+                __le16 listen_interval;
                 u8 ap[6]; /* nothing after here directly accessible */
                 u8 ssid_el_id;
                 u8 ssid_len;
@@ -3084,9 +3084,9 @@ static void authenticate(struct atmel_private *priv, u16 frame_len)
 static void associate(struct atmel_private *priv, u16 frame_len, u16 subtype)
 {
         struct ass_resp_format {
-                u16 capability;
-                u16 status;
-                u16 ass_id;
+                __le16 capability;
+                __le16 status;
+                __le16 ass_id;
                 u8 el_id;
                 u8 length;
                 u8 rates[4];
@@ -3293,9 +3293,9 @@ static void atmel_management_frame(struct atmel_private *priv,
                    never let an engineer loose with a data structure design. */
                 {
                         struct beacon_format {
-                                u64 timestamp;
-                                u16 interval;
-                                u16 capability;
+                                __le64 timestamp;
+                                __le16 interval;
+                                __le16 capability;
                                 u8 ssid_el_id;
                                 u8 ssid_length;
                                 /* ssid here */
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8d603257b926..b662ff3b9141 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -1566,7 +1566,7 @@ static void get_eeprom_mac(struct iwl3945_priv *priv, u8 *mac)
  */
 int iwl3945_eeprom_init(struct iwl3945_priv *priv)
 {
-        u16 *e = (u16 *)&priv->eeprom;
+        __le16 *e = (__le16 *)&priv->eeprom;
         u32 gp = iwl3945_read32(priv, CSR_EEPROM_GP);
         u32 r;
         int sz = sizeof(priv->eeprom);
@@ -1609,7 +1609,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)
                         IWL_ERROR("Time out reading EEPROM[%d]", addr);
                         return -ETIMEDOUT;
                 }
-                e[addr / 2] = le16_to_cpu(r >> 16);
+                e[addr / 2] = cpu_to_le16(r >> 16);
         }
 
         return 0;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 5a9fa42f999b..ce0574b087fb 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -1648,7 +1648,7 @@ static void get_eeprom_mac(struct iwl4965_priv *priv, u8 *mac)
  */
 int iwl4965_eeprom_init(struct iwl4965_priv *priv)
 {
-        u16 *e = (u16 *)&priv->eeprom;
+        __le16 *e = (__le16 *)&priv->eeprom;
         u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP);
         u32 r;
         int sz = sizeof(priv->eeprom);
@@ -1692,7 +1692,7 @@ int iwl4965_eeprom_init(struct iwl4965_priv *priv)
                         rc = -ETIMEDOUT;
                         goto done;
                 }
-                e[addr / 2] = le16_to_cpu(r >> 16);
+                e[addr / 2] = cpu_to_le16(r >> 16);
         }
         rc = 0;
 
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 8ba28a515d4a..f3858ee36f32 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -998,7 +998,7 @@ static int ray_hw_xmit(unsigned char* data, int len, struct net_device* dev,
 static int translate_frame(ray_dev_t *local, struct tx_msg __iomem *ptx, unsigned char *data,
                     int len)
 {
-    unsigned short int proto = ((struct ethhdr *)data)->h_proto;
+    __be16 proto = ((struct ethhdr *)data)->h_proto;
     if (ntohs(proto) >= 1536) { /* DIX II ethernet frame */
         DEBUG(3,"ray_cs translate_frame DIX II\n");
         /* Copy LLC header to card buffer */
diff --git a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
index 4b9de0093a7b..ca551a5d1390 100644
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -548,7 +548,7 @@ typedef struct wavepoint_beacon
                         spec_id2,       /* Unused */
                         pdu_type,       /* Unused */
                         seq;            /* WavePoint beacon sequence number */
-  unsigned short        domain_id,      /* WavePoint Domain ID */
+  __be16                domain_id,      /* WavePoint Domain ID */
                         nwid;           /* WavePoint NWID */
 } wavepoint_beacon;