diff options
Diffstat (limited to 'drivers/staging/wlan-ng')
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 58 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/hfa384x_usb.c | 4 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211conv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211conv.h | 28 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/p80211req.c | 3 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/prism2fw.c | 2 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/prism2mgmt.c | 1 | ||||
| -rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 2 |
8 files changed, 50 insertions, 50 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 5f1851c..310e2c4 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h @@ -482,7 +482,7 @@ struct hfa384x_tx_frame { u8 address3[6]; u16 sequence_control; u8 address4[6]; - u16 data_len; /* little endian format */ + __le16 data_len; /* little endian format */ /*-- 802.3 Header Information --*/ @@ -801,41 +801,41 @@ struct hfa384x_usb_txfrm { } __packed; struct hfa384x_usb_cmdreq { - u16 type; - u16 cmd; - u16 parm0; - u16 parm1; - u16 parm2; + __le16 type; + __le16 cmd; + __le16 parm0; + __le16 parm1; + __le16 parm2; u8 pad[54]; } __packed; struct hfa384x_usb_wridreq { - u16 type; - u16 frmlen; - u16 rid; + __le16 type; + __le16 frmlen; + __le16 rid; u8 data[HFA384x_RIDDATA_MAXLEN]; } __packed; struct hfa384x_usb_rridreq { - u16 type; - u16 frmlen; - u16 rid; + __le16 type; + __le16 frmlen; + __le16 rid; u8 pad[58]; } __packed; struct hfa384x_usb_wmemreq { - u16 type; - u16 frmlen; - u16 offset; - u16 page; + __le16 type; + __le16 frmlen; + __le16 offset; + __le16 page; u8 data[HFA384x_USB_RWMEM_MAXLEN]; } __packed; struct hfa384x_usb_rmemreq { - u16 type; - u16 frmlen; - u16 offset; - u16 page; + __le16 type; + __le16 frmlen; + __le16 offset; + __le16 page; u8 pad[56]; } __packed; @@ -854,16 +854,16 @@ struct hfa384x_usb_infofrm { struct hfa384x_usb_statusresp { u16 type; - u16 status; - u16 resp0; - u16 resp1; - u16 resp2; + __le16 status; + __le16 resp0; + __le16 resp1; + __le16 resp2; } __packed; struct hfa384x_usb_rridresp { u16 type; - u16 frmlen; - u16 rid; + __le16 frmlen; + __le16 rid; u8 data[HFA384x_RIDDATA_MAXLEN]; } __packed; @@ -1078,8 +1078,8 @@ struct hfa384x_pdr_end_of_pda { } __packed; struct hfa384x_pdrec { - u16 len; /* in words */ - u16 code; + __le16 len; /* in words */ + __le16 code; union pdr { struct hfa384x_pdr_pcb_partnum pcb_partnum; struct hfa384x_pdr_pcb_tracenum pcb_tracenum; @@ -1408,7 +1408,7 @@ hfa384x_drvr_setconfig_async(struct hfa384x *hw, static inline int hfa384x_drvr_setconfig16_async(struct hfa384x *hw, u16 rid, u16 val) { - u16 value = cpu_to_le16(val); + __le16 value = cpu_to_le16(val); return hfa384x_drvr_setconfig_async(hw, rid, &value, sizeof(value), NULL, NULL); diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c index 6134eba..a812e55 100644 --- a/drivers/staging/wlan-ng/hfa384x_usb.c +++ b/drivers/staging/wlan-ng/hfa384x_usb.c @@ -2316,7 +2316,7 @@ int hfa384x_drvr_ramdl_write(struct hfa384x *hw, u32 daddr, void *buf, u32 len) int hfa384x_drvr_readpda(struct hfa384x *hw, void *buf, unsigned int len) { int result = 0; - u16 *pda = buf; + __le16 *pda = buf; int pdaok = 0; int morepdrs = 1; int currpdr = 0; /* word offset of the current pdr */ @@ -3513,7 +3513,7 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev, caphdr->version = htonl(P80211CAPTURE_VERSION); caphdr->length = htonl(sizeof(struct p80211_caphdr)); - caphdr->mactime = __cpu_to_be64(rxdesc->time) * 1000; + caphdr->mactime = __cpu_to_be64(rxdesc->time * 1000); caphdr->hosttime = __cpu_to_be64(jiffies); caphdr->phytype = htonl(4); /* dss_dot11_b */ caphdr->channel = htonl(hw->sniff_channel); diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index 8b0905e..a062e80 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c @@ -211,7 +211,7 @@ int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv, return -ENOMEM; foo = wep_encrypt(wlandev, skb->data, p80211_wep->data, skb->len, - (wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK), + wlandev->hostwep & HOSTWEP_DEFAULTKEY_MASK, p80211_wep->iv, p80211_wep->icv); if (foo) { netdev_warn(wlandev->netdev, diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h index 04bac2e..66332b1 100644 --- a/drivers/staging/wlan-ng/p80211conv.h +++ b/drivers/staging/wlan-ng/p80211conv.h @@ -101,20 +101,20 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb); * Frame capture header. (See doc/capturefrm.txt) */ struct p80211_caphdr { - u32 version; - u32 length; - u64 mactime; - u64 hosttime; - u32 phytype; - u32 channel; - u32 datarate; - u32 antenna; - u32 priority; - u32 ssi_type; - s32 ssi_signal; - s32 ssi_noise; - u32 preamble; - u32 encoding; + __be32 version; + __be32 length; + __be64 mactime; + __be64 hosttime; + __be32 phytype; + __be32 channel; + __be32 datarate; + __be32 antenna; + __be32 priority; + __be32 ssi_type; + __be32 ssi_signal; + __be32 ssi_noise; + __be32 preamble; + __be32 encoding; }; /* buffer free method pointer type */ diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c index 621df98..afe8477 100644 --- a/drivers/staging/wlan-ng/p80211req.c +++ b/drivers/staging/wlan-ng/p80211req.c @@ -198,7 +198,8 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev, struct p80211msg_dot11req_mibget *mib_msg, int isget) { - struct p80211itemd *mibitem = (struct p80211itemd *)mib_msg->mibattribute.data; + struct p80211itemd *mibitem = + (struct p80211itemd *)mib_msg->mibattribute.data; struct p80211pstrd *pstr = (struct p80211pstrd *)mibitem->data; u8 *key = mibitem->data + sizeof(struct p80211pstrd); diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 2e349f8..afd877f 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c @@ -604,7 +604,7 @@ static int mkimage(struct imgchunk *clist, unsigned int *ccnt) */ static int mkpdrlist(struct pda *pda) { - u16 *pda16 = (u16 *)pda->buf; + __le16 *pda16 = (__le16 *)pda->buf; int curroff; /* in 'words' */ pda->nrec = 0; diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c index 0e671c3..e23a0d0 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.c +++ b/drivers/staging/wlan-ng/prism2mgmt.c @@ -1168,7 +1168,6 @@ int prism2mgmt_wlansniff(struct wlandevice *wlandev, void *msgp) } } else { result = hfa384x_drvr_disable(hw, 0); - } netdev_info(wlandev->netdev, "monitor mode disabled\n"); diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 984804b..9c2b4ef 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c @@ -1311,7 +1311,7 @@ void prism2sta_processing_defer(struct work_struct *data) /* This one indicates that the MAC has decided to and * successfully completed a change to another AP. We * should probably implement a reassociation indication - * in response to this one. I'm thinking that the the + * in response to this one. I'm thinking that the * p80211 layer needs to be notified in case of * buffering/queueing issues. User mode also needs to be * notified so that any BSS dependent elements can be |
