aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/wlan-ng/hfa384x_usb.c
diff options
context:
space:
mode:
authorEdgardo Hames <ehames@gmail.com>2010-07-31 12:06:52 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-02 21:20:03 -0400
commit51e4896adad00a066fad65649405c1c9fa108157 (patch)
tree9788b9572f078e0f7f86e60fd17e10bbe7d0a7e3 /drivers/staging/wlan-ng/hfa384x_usb.c
parent93df38e593d949de83a6447d016cc4b07d392f47 (diff)
Staging: wlan-ng: fix style issues in p80211conv.h
This patch removes typedefs in p80211conv.h. Signed-off-by: Edgardo Hames <ehames@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/hfa384x_usb.c')
-rw-r--r--drivers/staging/wlan-ng/hfa384x_usb.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 925a7c50ba3..ea81cb547bb 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -2707,7 +2707,7 @@ int hfa384x_drvr_stop(hfa384x_t *hw)
2707----------------------------------------------------------------*/ 2707----------------------------------------------------------------*/
2708int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, 2708int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb,
2709 union p80211_hdr *p80211_hdr, 2709 union p80211_hdr *p80211_hdr,
2710 p80211_metawep_t *p80211_wep) 2710 struct p80211_metawep *p80211_wep)
2711{ 2711{
2712 int usbpktlen = sizeof(hfa384x_tx_frame_t); 2712 int usbpktlen = sizeof(hfa384x_tx_frame_t);
2713 int result; 2713 int result;
@@ -3473,7 +3473,7 @@ static void hfa384x_usbin_rx(wlandevice_t *wlandev, struct sk_buff *skb)
3473 hfa384x_usbin_t *usbin = (hfa384x_usbin_t *) skb->data; 3473 hfa384x_usbin_t *usbin = (hfa384x_usbin_t *) skb->data;
3474 hfa384x_t *hw = wlandev->priv; 3474 hfa384x_t *hw = wlandev->priv;
3475 int hdrlen; 3475 int hdrlen;
3476 p80211_rxmeta_t *rxmeta; 3476 struct p80211_rxmeta *rxmeta;
3477 u16 data_len; 3477 u16 data_len;
3478 u16 fc; 3478 u16 fc;
3479 3479
@@ -3590,14 +3590,14 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,
3590 datalen = le16_to_cpu(rxdesc->data_len); 3590 datalen = le16_to_cpu(rxdesc->data_len);
3591 3591
3592 /* Allocate an ind message+framesize skb */ 3592 /* Allocate an ind message+framesize skb */
3593 skblen = sizeof(p80211_caphdr_t) + hdrlen + datalen + WLAN_CRC_LEN; 3593 skblen = sizeof(struct p80211_caphdr) + hdrlen + datalen + WLAN_CRC_LEN;
3594 3594
3595 /* sanity check the length */ 3595 /* sanity check the length */
3596 if (skblen > 3596 if (skblen >
3597 (sizeof(p80211_caphdr_t) + 3597 (sizeof(struct p80211_caphdr) +
3598 WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN)) { 3598 WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN)) {
3599 pr_debug("overlen frm: len=%zd\n", 3599 pr_debug("overlen frm: len=%zd\n",
3600 skblen - sizeof(p80211_caphdr_t)); 3600 skblen - sizeof(struct p80211_caphdr));
3601 } 3601 }
3602 3602
3603 skb = dev_alloc_skb(skblen); 3603 skb = dev_alloc_skb(skblen);
@@ -3611,13 +3611,13 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,
3611 /* only prepend the prism header if in the right mode */ 3611 /* only prepend the prism header if in the right mode */
3612 if ((wlandev->netdev->type == ARPHRD_IEEE80211_PRISM) && 3612 if ((wlandev->netdev->type == ARPHRD_IEEE80211_PRISM) &&
3613 (hw->sniffhdr != 0)) { 3613 (hw->sniffhdr != 0)) {
3614 p80211_caphdr_t *caphdr; 3614 struct p80211_caphdr *caphdr;
3615 /* The NEW header format! */ 3615 /* The NEW header format! */
3616 datap = skb_put(skb, sizeof(p80211_caphdr_t)); 3616 datap = skb_put(skb, sizeof(struct p80211_caphdr));
3617 caphdr = (p80211_caphdr_t *) datap; 3617 caphdr = (struct p80211_caphdr *) datap;
3618 3618
3619 caphdr->version = htonl(P80211CAPTURE_VERSION); 3619 caphdr->version = htonl(P80211CAPTURE_VERSION);
3620 caphdr->length = htonl(sizeof(p80211_caphdr_t)); 3620 caphdr->length = htonl(sizeof(struct p80211_caphdr));
3621 caphdr->mactime = __cpu_to_be64(rxdesc->time) * 1000; 3621 caphdr->mactime = __cpu_to_be64(rxdesc->time) * 1000;
3622 caphdr->hosttime = __cpu_to_be64(jiffies); 3622 caphdr->hosttime = __cpu_to_be64(jiffies);
3623 caphdr->phytype = htonl(4); /* dss_dot11_b */ 3623 caphdr->phytype = htonl(4); /* dss_dot11_b */