diff options
-rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 2 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/hfa384x_usb.c | 18 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211conv.c | 64 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211conv.h | 40 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.c | 4 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211netdev.h | 2 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/prism2sta.c | 4 |
7 files changed, 67 insertions, 67 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index e3269f4b4fd..fa94a7cc86c 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h | |||
@@ -1409,7 +1409,7 @@ int hfa384x_drvr_start(hfa384x_t *hw); | |||
1409 | int hfa384x_drvr_stop(hfa384x_t *hw); | 1409 | int hfa384x_drvr_stop(hfa384x_t *hw); |
1410 | int | 1410 | int |
1411 | hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, | 1411 | hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, |
1412 | union p80211_hdr *p80211_hdr, p80211_metawep_t *p80211_wep); | 1412 | union p80211_hdr *p80211_hdr, struct p80211_metawep *p80211_wep); |
1413 | void hfa384x_tx_timeout(wlandevice_t *wlandev); | 1413 | void hfa384x_tx_timeout(wlandevice_t *wlandev); |
1414 | 1414 | ||
1415 | int hfa384x_cmd_initialize(hfa384x_t *hw); | 1415 | int hfa384x_cmd_initialize(hfa384x_t *hw); |
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 | ----------------------------------------------------------------*/ |
2708 | int hfa384x_drvr_txframe(hfa384x_t *hw, struct sk_buff *skb, | 2708 | int 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 */ |
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c index 409a7c88021..83879f9a0b7 100644 --- a/drivers/staging/wlan-ng/p80211conv.c +++ b/drivers/staging/wlan-ng/p80211conv.c | |||
@@ -104,14 +104,14 @@ static u8 oui_8021h[] = { 0x00, 0x00, 0xf8 }; | |||
104 | ----------------------------------------------------------------*/ | 104 | ----------------------------------------------------------------*/ |
105 | int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, | 105 | int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, |
106 | struct sk_buff *skb, union p80211_hdr *p80211_hdr, | 106 | struct sk_buff *skb, union p80211_hdr *p80211_hdr, |
107 | p80211_metawep_t *p80211_wep) | 107 | struct p80211_metawep *p80211_wep) |
108 | { | 108 | { |
109 | 109 | ||
110 | u16 fc; | 110 | u16 fc; |
111 | u16 proto; | 111 | u16 proto; |
112 | wlan_ethhdr_t e_hdr; | 112 | struct wlan_ethhdr e_hdr; |
113 | wlan_llc_t *e_llc; | 113 | struct wlan_llc *e_llc; |
114 | wlan_snap_t *e_snap; | 114 | struct wlan_snap *e_snap; |
115 | int foo; | 115 | int foo; |
116 | 116 | ||
117 | memcpy(&e_hdr, skb->data, sizeof(e_hdr)); | 117 | memcpy(&e_hdr, skb->data, sizeof(e_hdr)); |
@@ -148,7 +148,7 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, | |||
148 | 148 | ||
149 | /* tack on SNAP */ | 149 | /* tack on SNAP */ |
150 | e_snap = | 150 | e_snap = |
151 | (wlan_snap_t *) skb_push(skb, sizeof(wlan_snap_t)); | 151 | (struct wlan_snap *) skb_push(skb, sizeof(struct wlan_snap)); |
152 | e_snap->type = htons(proto); | 152 | e_snap->type = htons(proto); |
153 | if (ethconv == WLAN_ETHCONV_8021h | 153 | if (ethconv == WLAN_ETHCONV_8021h |
154 | && p80211_stt_findproto(proto)) { | 154 | && p80211_stt_findproto(proto)) { |
@@ -161,7 +161,7 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, | |||
161 | 161 | ||
162 | /* tack on llc */ | 162 | /* tack on llc */ |
163 | e_llc = | 163 | e_llc = |
164 | (wlan_llc_t *) skb_push(skb, sizeof(wlan_llc_t)); | 164 | (struct wlan_llc *) skb_push(skb, sizeof(struct wlan_llc)); |
165 | e_llc->dsap = 0xAA; /* SNAP, see IEEE 802 */ | 165 | e_llc->dsap = 0xAA; /* SNAP, see IEEE 802 */ |
166 | e_llc->ssap = 0xAA; | 166 | e_llc->ssap = 0xAA; |
167 | e_llc->ctl = 0x03; | 167 | e_llc->ctl = 0x03; |
@@ -230,7 +230,7 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv, | |||
230 | 230 | ||
231 | /* jkriegl: from orinoco, modified */ | 231 | /* jkriegl: from orinoco, modified */ |
232 | static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac, | 232 | static void orinoco_spy_gather(wlandevice_t *wlandev, char *mac, |
233 | p80211_rxmeta_t *rxmeta) | 233 | struct p80211_rxmeta *rxmeta) |
234 | { | 234 | { |
235 | int i; | 235 | int i; |
236 | 236 | ||
@@ -281,9 +281,9 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, | |||
281 | u8 daddr[WLAN_ETHADDR_LEN]; | 281 | u8 daddr[WLAN_ETHADDR_LEN]; |
282 | u8 saddr[WLAN_ETHADDR_LEN]; | 282 | u8 saddr[WLAN_ETHADDR_LEN]; |
283 | union p80211_hdr *w_hdr; | 283 | union p80211_hdr *w_hdr; |
284 | wlan_ethhdr_t *e_hdr; | 284 | struct wlan_ethhdr *e_hdr; |
285 | wlan_llc_t *e_llc; | 285 | struct wlan_llc *e_llc; |
286 | wlan_snap_t *e_snap; | 286 | struct wlan_snap *e_snap; |
287 | 287 | ||
288 | int foo; | 288 | int foo; |
289 | 289 | ||
@@ -345,14 +345,14 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, | |||
345 | wlandev->rx.decrypt++; | 345 | wlandev->rx.decrypt++; |
346 | } | 346 | } |
347 | 347 | ||
348 | e_hdr = (wlan_ethhdr_t *) (skb->data + payload_offset); | 348 | e_hdr = (struct wlan_ethhdr *) (skb->data + payload_offset); |
349 | 349 | ||
350 | e_llc = (wlan_llc_t *) (skb->data + payload_offset); | 350 | e_llc = (struct wlan_llc *) (skb->data + payload_offset); |
351 | e_snap = | 351 | e_snap = |
352 | (wlan_snap_t *) (skb->data + payload_offset + sizeof(wlan_llc_t)); | 352 | (struct wlan_snap *) (skb->data + payload_offset + sizeof(struct wlan_llc)); |
353 | 353 | ||
354 | /* Test for the various encodings */ | 354 | /* Test for the various encodings */ |
355 | if ((payload_length >= sizeof(wlan_ethhdr_t)) && | 355 | if ((payload_length >= sizeof(struct wlan_ethhdr)) && |
356 | (e_llc->dsap != 0xaa || e_llc->ssap != 0xaa) && | 356 | (e_llc->dsap != 0xaa || e_llc->ssap != 0xaa) && |
357 | ((memcmp(daddr, e_hdr->daddr, WLAN_ETHADDR_LEN) == 0) || | 357 | ((memcmp(daddr, e_hdr->daddr, WLAN_ETHADDR_LEN) == 0) || |
358 | (memcmp(saddr, e_hdr->saddr, WLAN_ETHADDR_LEN) == 0))) { | 358 | (memcmp(saddr, e_hdr->saddr, WLAN_ETHADDR_LEN) == 0))) { |
@@ -372,7 +372,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, | |||
372 | /* chop off the 802.11 CRC */ | 372 | /* chop off the 802.11 CRC */ |
373 | skb_trim(skb, skb->len - WLAN_CRC_LEN); | 373 | skb_trim(skb, skb->len - WLAN_CRC_LEN); |
374 | 374 | ||
375 | } else if ((payload_length >= sizeof(wlan_llc_t) + sizeof(wlan_snap_t)) | 375 | } else if ((payload_length >= sizeof(struct wlan_llc) + sizeof(struct wlan_snap)) |
376 | && (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa) | 376 | && (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa) |
377 | && (e_llc->ctl == 0x03) | 377 | && (e_llc->ctl == 0x03) |
378 | && | 378 | && |
@@ -398,7 +398,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, | |||
398 | skb_pull(skb, payload_offset); | 398 | skb_pull(skb, payload_offset); |
399 | 399 | ||
400 | /* create 802.3 header at beginning of skb. */ | 400 | /* create 802.3 header at beginning of skb. */ |
401 | e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN); | 401 | e_hdr = (struct wlan_ethhdr *) skb_push(skb, WLAN_ETHHDR_LEN); |
402 | memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN); | 402 | memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN); |
403 | memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN); | 403 | memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN); |
404 | e_hdr->type = htons(payload_length); | 404 | e_hdr->type = htons(payload_length); |
@@ -406,7 +406,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, | |||
406 | /* chop off the 802.11 CRC */ | 406 | /* chop off the 802.11 CRC */ |
407 | skb_trim(skb, skb->len - WLAN_CRC_LEN); | 407 | skb_trim(skb, skb->len - WLAN_CRC_LEN); |
408 | 408 | ||
409 | } else if ((payload_length >= sizeof(wlan_llc_t) + sizeof(wlan_snap_t)) | 409 | } else if ((payload_length >= sizeof(struct wlan_llc) + sizeof(struct wlan_snap)) |
410 | && (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa) | 410 | && (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa) |
411 | && (e_llc->ctl == 0x03)) { | 411 | && (e_llc->ctl == 0x03)) { |
412 | pr_debug("802.1h/RFC1042 len: %d\n", payload_length); | 412 | pr_debug("802.1h/RFC1042 len: %d\n", payload_length); |
@@ -414,13 +414,13 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, | |||
414 | /* build a DIXII + RFC894 */ | 414 | /* build a DIXII + RFC894 */ |
415 | 415 | ||
416 | /* Test for an overlength frame */ | 416 | /* Test for an overlength frame */ |
417 | if ((payload_length - sizeof(wlan_llc_t) - sizeof(wlan_snap_t)) | 417 | if ((payload_length - sizeof(struct wlan_llc) - sizeof(struct wlan_snap)) |
418 | > netdev->mtu) { | 418 | > netdev->mtu) { |
419 | /* A bogus length ethfrm has been sent. */ | 419 | /* A bogus length ethfrm has been sent. */ |
420 | /* Is someone trying an oflow attack? */ | 420 | /* Is someone trying an oflow attack? */ |
421 | printk(KERN_ERR "DIXII frame too large (%ld > %d)\n", | 421 | printk(KERN_ERR "DIXII frame too large (%ld > %d)\n", |
422 | (long int)(payload_length - sizeof(wlan_llc_t) - | 422 | (long int)(payload_length - sizeof(struct wlan_llc) - |
423 | sizeof(wlan_snap_t)), netdev->mtu); | 423 | sizeof(struct wlan_snap)), netdev->mtu); |
424 | return 1; | 424 | return 1; |
425 | } | 425 | } |
426 | 426 | ||
@@ -428,13 +428,13 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, | |||
428 | skb_pull(skb, payload_offset); | 428 | skb_pull(skb, payload_offset); |
429 | 429 | ||
430 | /* chop llc header from skb. */ | 430 | /* chop llc header from skb. */ |
431 | skb_pull(skb, sizeof(wlan_llc_t)); | 431 | skb_pull(skb, sizeof(struct wlan_llc)); |
432 | 432 | ||
433 | /* chop snap header from skb. */ | 433 | /* chop snap header from skb. */ |
434 | skb_pull(skb, sizeof(wlan_snap_t)); | 434 | skb_pull(skb, sizeof(struct wlan_snap)); |
435 | 435 | ||
436 | /* create 802.3 header at beginning of skb. */ | 436 | /* create 802.3 header at beginning of skb. */ |
437 | e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN); | 437 | e_hdr = (struct wlan_ethhdr *) skb_push(skb, WLAN_ETHHDR_LEN); |
438 | e_hdr->type = e_snap->type; | 438 | e_hdr->type = e_snap->type; |
439 | memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN); | 439 | memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN); |
440 | memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN); | 440 | memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN); |
@@ -461,7 +461,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, | |||
461 | skb_pull(skb, payload_offset); | 461 | skb_pull(skb, payload_offset); |
462 | 462 | ||
463 | /* create 802.3 header at beginning of skb. */ | 463 | /* create 802.3 header at beginning of skb. */ |
464 | e_hdr = (wlan_ethhdr_t *) skb_push(skb, WLAN_ETHHDR_LEN); | 464 | e_hdr = (struct wlan_ethhdr *) skb_push(skb, WLAN_ETHHDR_LEN); |
465 | memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN); | 465 | memcpy(e_hdr->daddr, daddr, WLAN_ETHADDR_LEN); |
466 | memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN); | 466 | memcpy(e_hdr->saddr, saddr, WLAN_ETHADDR_LEN); |
467 | e_hdr->type = htons(payload_length); | 467 | e_hdr->type = htons(payload_length); |
@@ -542,8 +542,8 @@ int p80211_stt_findproto(u16 proto) | |||
542 | ----------------------------------------------------------------*/ | 542 | ----------------------------------------------------------------*/ |
543 | void p80211skb_rxmeta_detach(struct sk_buff *skb) | 543 | void p80211skb_rxmeta_detach(struct sk_buff *skb) |
544 | { | 544 | { |
545 | p80211_rxmeta_t *rxmeta; | 545 | struct p80211_rxmeta *rxmeta; |
546 | p80211_frmmeta_t *frmmeta; | 546 | struct p80211_frmmeta *frmmeta; |
547 | 547 | ||
548 | /* Sanity checks */ | 548 | /* Sanity checks */ |
549 | if (skb == NULL) { /* bad skb */ | 549 | if (skb == NULL) { /* bad skb */ |
@@ -589,8 +589,8 @@ exit: | |||
589 | int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb) | 589 | int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb) |
590 | { | 590 | { |
591 | int result = 0; | 591 | int result = 0; |
592 | p80211_rxmeta_t *rxmeta; | 592 | struct p80211_rxmeta *rxmeta; |
593 | p80211_frmmeta_t *frmmeta; | 593 | struct p80211_frmmeta *frmmeta; |
594 | 594 | ||
595 | /* If these already have metadata, we error out! */ | 595 | /* If these already have metadata, we error out! */ |
596 | if (P80211SKB_RXMETA(skb) != NULL) { | 596 | if (P80211SKB_RXMETA(skb) != NULL) { |
@@ -601,7 +601,7 @@ int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb) | |||
601 | } | 601 | } |
602 | 602 | ||
603 | /* Allocate the rxmeta */ | 603 | /* Allocate the rxmeta */ |
604 | rxmeta = kzalloc(sizeof(p80211_rxmeta_t), GFP_ATOMIC); | 604 | rxmeta = kzalloc(sizeof(struct p80211_rxmeta), GFP_ATOMIC); |
605 | 605 | ||
606 | if (rxmeta == NULL) { | 606 | if (rxmeta == NULL) { |
607 | printk(KERN_ERR "%s: Failed to allocate rxmeta.\n", | 607 | printk(KERN_ERR "%s: Failed to allocate rxmeta.\n", |
@@ -615,8 +615,8 @@ int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb) | |||
615 | rxmeta->hosttime = jiffies; | 615 | rxmeta->hosttime = jiffies; |
616 | 616 | ||
617 | /* Overlay a frmmeta_t onto skb->cb */ | 617 | /* Overlay a frmmeta_t onto skb->cb */ |
618 | memset(skb->cb, 0, sizeof(p80211_frmmeta_t)); | 618 | memset(skb->cb, 0, sizeof(struct p80211_frmmeta)); |
619 | frmmeta = (p80211_frmmeta_t *) (skb->cb); | 619 | frmmeta = (struct p80211_frmmeta *) (skb->cb); |
620 | frmmeta->magic = P80211_FRMMETA_MAGIC; | 620 | frmmeta->magic = P80211_FRMMETA_MAGIC; |
621 | frmmeta->rx = rxmeta; | 621 | frmmeta->rx = rxmeta; |
622 | exit: | 622 | exit: |
@@ -641,7 +641,7 @@ exit: | |||
641 | ----------------------------------------------------------------*/ | 641 | ----------------------------------------------------------------*/ |
642 | void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb) | 642 | void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb) |
643 | { | 643 | { |
644 | p80211_frmmeta_t *meta; | 644 | struct p80211_frmmeta *meta; |
645 | 645 | ||
646 | meta = P80211SKB_FRMMETA(skb); | 646 | meta = P80211SKB_FRMMETA(skb); |
647 | if (meta && meta->rx) | 647 | if (meta && meta->rx) |
diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h index 65ab2115df1..eca0391c676 100644 --- a/drivers/staging/wlan-ng/p80211conv.h +++ b/drivers/staging/wlan-ng/p80211conv.h | |||
@@ -63,17 +63,17 @@ | |||
63 | 63 | ||
64 | #define P80211CAPTURE_VERSION 0x80211001 | 64 | #define P80211CAPTURE_VERSION 0x80211001 |
65 | 65 | ||
66 | #define P80211_FRMMETA_MAGIC 0x802110 | 66 | #define P80211_FRMMETA_MAGIC 0x802110 |
67 | 67 | ||
68 | #define P80211SKB_FRMMETA(s) \ | 68 | #define P80211SKB_FRMMETA(s) \ |
69 | (((((p80211_frmmeta_t *)((s)->cb))->magic) == P80211_FRMMETA_MAGIC) ? \ | 69 | (((((struct p80211_frmmeta *)((s)->cb))->magic) == P80211_FRMMETA_MAGIC) ? \ |
70 | ((p80211_frmmeta_t *)((s)->cb)) : \ | 70 | ((struct p80211_frmmeta *)((s)->cb)) : \ |
71 | (NULL)) | 71 | (NULL)) |
72 | 72 | ||
73 | #define P80211SKB_RXMETA(s) \ | 73 | #define P80211SKB_RXMETA(s) \ |
74 | (P80211SKB_FRMMETA((s)) ? P80211SKB_FRMMETA((s))->rx : ((p80211_rxmeta_t *)(NULL))) | 74 | (P80211SKB_FRMMETA((s)) ? P80211SKB_FRMMETA((s))->rx : ((struct p80211_rxmeta *)(NULL))) |
75 | 75 | ||
76 | typedef struct p80211_rxmeta { | 76 | struct p80211_rxmeta { |
77 | struct wlandevice *wlandev; | 77 | struct wlandevice *wlandev; |
78 | 78 | ||
79 | u64 mactime; /* Hi-rez MAC-supplied time value */ | 79 | u64 mactime; /* Hi-rez MAC-supplied time value */ |
@@ -87,12 +87,12 @@ typedef struct p80211_rxmeta { | |||
87 | unsigned int preamble; /* P80211ENUM_preambletype_* */ | 87 | unsigned int preamble; /* P80211ENUM_preambletype_* */ |
88 | unsigned int encoding; /* P80211ENUM_encoding_* */ | 88 | unsigned int encoding; /* P80211ENUM_encoding_* */ |
89 | 89 | ||
90 | } p80211_rxmeta_t; | 90 | }; |
91 | 91 | ||
92 | typedef struct p80211_frmmeta { | 92 | struct p80211_frmmeta { |
93 | unsigned int magic; | 93 | unsigned int magic; |
94 | p80211_rxmeta_t *rx; | 94 | struct p80211_rxmeta *rx; |
95 | } p80211_frmmeta_t; | 95 | }; |
96 | 96 | ||
97 | void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb); | 97 | void p80211skb_free(struct wlandevice *wlandev, struct sk_buff *skb); |
98 | int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb); | 98 | int p80211skb_rxmeta_attach(struct wlandevice *wlandev, struct sk_buff *skb); |
@@ -101,7 +101,7 @@ void p80211skb_rxmeta_detach(struct sk_buff *skb); | |||
101 | /* | 101 | /* |
102 | * Frame capture header. (See doc/capturefrm.txt) | 102 | * Frame capture header. (See doc/capturefrm.txt) |
103 | */ | 103 | */ |
104 | typedef struct p80211_caphdr { | 104 | struct p80211_caphdr { |
105 | u32 version; | 105 | u32 version; |
106 | u32 length; | 106 | u32 length; |
107 | u64 mactime; | 107 | u64 mactime; |
@@ -116,36 +116,36 @@ typedef struct p80211_caphdr { | |||
116 | s32 ssi_noise; | 116 | s32 ssi_noise; |
117 | u32 preamble; | 117 | u32 preamble; |
118 | u32 encoding; | 118 | u32 encoding; |
119 | } p80211_caphdr_t; | 119 | }; |
120 | 120 | ||
121 | /* buffer free method pointer type */ | 121 | /* buffer free method pointer type */ |
122 | typedef void (*freebuf_method_t) (void *buf, int size); | 122 | typedef void (*freebuf_method_t) (void *buf, int size); |
123 | 123 | ||
124 | typedef struct p80211_metawep { | 124 | struct p80211_metawep { |
125 | void *data; | 125 | void *data; |
126 | u8 iv[4]; | 126 | u8 iv[4]; |
127 | u8 icv[4]; | 127 | u8 icv[4]; |
128 | } p80211_metawep_t; | 128 | }; |
129 | 129 | ||
130 | /* local ether header type */ | 130 | /* local ether header type */ |
131 | typedef struct wlan_ethhdr { | 131 | struct wlan_ethhdr { |
132 | u8 daddr[WLAN_ETHADDR_LEN]; | 132 | u8 daddr[WLAN_ETHADDR_LEN]; |
133 | u8 saddr[WLAN_ETHADDR_LEN]; | 133 | u8 saddr[WLAN_ETHADDR_LEN]; |
134 | u16 type; | 134 | u16 type; |
135 | } __attribute__ ((packed)) wlan_ethhdr_t; | 135 | } __attribute__ ((packed)); |
136 | 136 | ||
137 | /* local llc header type */ | 137 | /* local llc header type */ |
138 | typedef struct wlan_llc { | 138 | struct wlan_llc { |
139 | u8 dsap; | 139 | u8 dsap; |
140 | u8 ssap; | 140 | u8 ssap; |
141 | u8 ctl; | 141 | u8 ctl; |
142 | } __attribute__ ((packed)) wlan_llc_t; | 142 | } __attribute__ ((packed)); |
143 | 143 | ||
144 | /* local snap header type */ | 144 | /* local snap header type */ |
145 | typedef struct wlan_snap { | 145 | struct wlan_snap { |
146 | u8 oui[WLAN_IEEE_OUI_LEN]; | 146 | u8 oui[WLAN_IEEE_OUI_LEN]; |
147 | u16 type; | 147 | u16 type; |
148 | } __attribute__ ((packed)) wlan_snap_t; | 148 | } __attribute__ ((packed)); |
149 | 149 | ||
150 | /* Circular include trick */ | 150 | /* Circular include trick */ |
151 | struct wlandevice; | 151 | struct wlandevice; |
@@ -154,7 +154,7 @@ int skb_p80211_to_ether(struct wlandevice *wlandev, u32 ethconv, | |||
154 | struct sk_buff *skb); | 154 | struct sk_buff *skb); |
155 | int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv, | 155 | int skb_ether_to_p80211(struct wlandevice *wlandev, u32 ethconv, |
156 | struct sk_buff *skb, union p80211_hdr *p80211_hdr, | 156 | struct sk_buff *skb, union p80211_hdr *p80211_hdr, |
157 | p80211_metawep_t *p80211_wep); | 157 | struct p80211_metawep *p80211_wep); |
158 | 158 | ||
159 | int p80211_stt_findproto(u16 proto); | 159 | int p80211_stt_findproto(u16 proto); |
160 | 160 | ||
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index c299acea988..5b68af04d4e 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c | |||
@@ -351,7 +351,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb, | |||
351 | int txresult = -1; | 351 | int txresult = -1; |
352 | wlandevice_t *wlandev = netdev->ml_priv; | 352 | wlandevice_t *wlandev = netdev->ml_priv; |
353 | union p80211_hdr p80211_hdr; | 353 | union p80211_hdr p80211_hdr; |
354 | p80211_metawep_t p80211_wep; | 354 | struct p80211_metawep p80211_wep; |
355 | 355 | ||
356 | if (skb == NULL) | 356 | if (skb == NULL) |
357 | return NETDEV_TX_OK; | 357 | return NETDEV_TX_OK; |
@@ -362,7 +362,7 @@ static int p80211knetdev_hard_start_xmit(struct sk_buff *skb, | |||
362 | } | 362 | } |
363 | 363 | ||
364 | memset(&p80211_hdr, 0, sizeof(union p80211_hdr)); | 364 | memset(&p80211_hdr, 0, sizeof(union p80211_hdr)); |
365 | memset(&p80211_wep, 0, sizeof(p80211_metawep_t)); | 365 | memset(&p80211_wep, 0, sizeof(struct p80211_metawep)); |
366 | 366 | ||
367 | if (netif_queue_stopped(netdev)) { | 367 | if (netif_queue_stopped(netdev)) { |
368 | pr_debug("called when queue stopped.\n"); | 368 | pr_debug("called when queue stopped.\n"); |
diff --git a/drivers/staging/wlan-ng/p80211netdev.h b/drivers/staging/wlan-ng/p80211netdev.h index 3e19dade5e7..3c7216212e1 100644 --- a/drivers/staging/wlan-ng/p80211netdev.h +++ b/drivers/staging/wlan-ng/p80211netdev.h | |||
@@ -185,7 +185,7 @@ typedef struct wlandevice { | |||
185 | void (*reset) (struct wlandevice *wlandev); | 185 | void (*reset) (struct wlandevice *wlandev); |
186 | int (*txframe) (struct wlandevice *wlandev, struct sk_buff *skb, | 186 | int (*txframe) (struct wlandevice *wlandev, struct sk_buff *skb, |
187 | union p80211_hdr *p80211_hdr, | 187 | union p80211_hdr *p80211_hdr, |
188 | p80211_metawep_t *p80211_wep); | 188 | struct p80211_metawep *p80211_wep); |
189 | int (*mlmerequest) (struct wlandevice *wlandev, p80211msg_t *msg); | 189 | int (*mlmerequest) (struct wlandevice *wlandev, p80211msg_t *msg); |
190 | int (*set_multicast_list) (struct wlandevice *wlandev, | 190 | int (*set_multicast_list) (struct wlandevice *wlandev, |
191 | netdevice_t *dev); | 191 | netdevice_t *dev); |
diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c index 6f5fc011c91..5ac6aa61064 100644 --- a/drivers/staging/wlan-ng/prism2sta.c +++ b/drivers/staging/wlan-ng/prism2sta.c | |||
@@ -131,7 +131,7 @@ static int prism2sta_close(wlandevice_t *wlandev); | |||
131 | static void prism2sta_reset(wlandevice_t *wlandev); | 131 | static void prism2sta_reset(wlandevice_t *wlandev); |
132 | static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb, | 132 | static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb, |
133 | union p80211_hdr *p80211_hdr, | 133 | union p80211_hdr *p80211_hdr, |
134 | p80211_metawep_t *p80211_wep); | 134 | struct p80211_metawep *p80211_wep); |
135 | static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg); | 135 | static int prism2sta_mlmerequest(wlandevice_t *wlandev, p80211msg_t *msg); |
136 | static int prism2sta_getcardinfo(wlandevice_t *wlandev); | 136 | static int prism2sta_getcardinfo(wlandevice_t *wlandev); |
137 | static int prism2sta_globalsetup(wlandevice_t *wlandev); | 137 | static int prism2sta_globalsetup(wlandevice_t *wlandev); |
@@ -269,7 +269,7 @@ static void prism2sta_reset(wlandevice_t *wlandev) | |||
269 | ----------------------------------------------------------------*/ | 269 | ----------------------------------------------------------------*/ |
270 | static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb, | 270 | static int prism2sta_txframe(wlandevice_t *wlandev, struct sk_buff *skb, |
271 | union p80211_hdr *p80211_hdr, | 271 | union p80211_hdr *p80211_hdr, |
272 | p80211_metawep_t *p80211_wep) | 272 | struct p80211_metawep *p80211_wep) |
273 | { | 273 | { |
274 | hfa384x_t *hw = (hfa384x_t *) wlandev->priv; | 274 | hfa384x_t *hw = (hfa384x_t *) wlandev->priv; |
275 | int result; | 275 | int result; |