diff options
Diffstat (limited to 'drivers/usb/net/zd1201.c')
-rw-r--r-- | drivers/usb/net/zd1201.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c index 341ae5f732dd..17b9718b8de6 100644 --- a/drivers/usb/net/zd1201.c +++ b/drivers/usb/net/zd1201.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
22 | #include <linux/if_arp.h> | 22 | #include <linux/if_arp.h> |
23 | #include <linux/firmware.h> | 23 | #include <linux/firmware.h> |
24 | #include <ieee802_11.h> | 24 | #include <net/ieee80211.h> |
25 | #include "zd1201.h" | 25 | #include "zd1201.h" |
26 | 26 | ||
27 | static struct usb_device_id zd1201_table[] = { | 27 | static struct usb_device_id zd1201_table[] = { |
@@ -337,25 +337,25 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) | |||
337 | goto resubmit; | 337 | goto resubmit; |
338 | } | 338 | } |
339 | 339 | ||
340 | if ((seq & IEEE802_11_SCTL_FRAG) || | 340 | if ((seq & IEEE80211_SCTL_FRAG) || |
341 | (fc & IEEE802_11_FCTL_MOREFRAGS)) { | 341 | (fc & IEEE80211_FCTL_MOREFRAGS)) { |
342 | struct zd1201_frag *frag = NULL; | 342 | struct zd1201_frag *frag = NULL; |
343 | char *ptr; | 343 | char *ptr; |
344 | 344 | ||
345 | if (datalen<14) | 345 | if (datalen<14) |
346 | goto resubmit; | 346 | goto resubmit; |
347 | if ((seq & IEEE802_11_SCTL_FRAG) == 0) { | 347 | if ((seq & IEEE80211_SCTL_FRAG) == 0) { |
348 | frag = kmalloc(sizeof(struct zd1201_frag*), | 348 | frag = kmalloc(sizeof(struct zd1201_frag*), |
349 | GFP_ATOMIC); | 349 | GFP_ATOMIC); |
350 | if (!frag) | 350 | if (!frag) |
351 | goto resubmit; | 351 | goto resubmit; |
352 | skb = dev_alloc_skb(IEEE802_11_DATA_LEN +14+2); | 352 | skb = dev_alloc_skb(IEEE80211_DATA_LEN +14+2); |
353 | if (!skb) { | 353 | if (!skb) { |
354 | kfree(frag); | 354 | kfree(frag); |
355 | goto resubmit; | 355 | goto resubmit; |
356 | } | 356 | } |
357 | frag->skb = skb; | 357 | frag->skb = skb; |
358 | frag->seq = seq & IEEE802_11_SCTL_SEQ; | 358 | frag->seq = seq & IEEE80211_SCTL_SEQ; |
359 | skb_reserve(skb, 2); | 359 | skb_reserve(skb, 2); |
360 | memcpy(skb_put(skb, 12), &data[datalen-14], 12); | 360 | memcpy(skb_put(skb, 12), &data[datalen-14], 12); |
361 | memcpy(skb_put(skb, 2), &data[6], 2); | 361 | memcpy(skb_put(skb, 2), &data[6], 2); |
@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) | |||
364 | goto resubmit; | 364 | goto resubmit; |
365 | } | 365 | } |
366 | hlist_for_each_entry(frag, node, &zd->fraglist, fnode) | 366 | hlist_for_each_entry(frag, node, &zd->fraglist, fnode) |
367 | if(frag->seq == (seq&IEEE802_11_SCTL_SEQ)) | 367 | if(frag->seq == (seq&IEEE80211_SCTL_SEQ)) |
368 | break; | 368 | break; |
369 | if (!frag) | 369 | if (!frag) |
370 | goto resubmit; | 370 | goto resubmit; |
@@ -372,7 +372,7 @@ static void zd1201_usbrx(struct urb *urb, struct pt_regs *regs) | |||
372 | ptr = skb_put(skb, len); | 372 | ptr = skb_put(skb, len); |
373 | if (ptr) | 373 | if (ptr) |
374 | memcpy(ptr, data+8, len); | 374 | memcpy(ptr, data+8, len); |
375 | if (fc & IEEE802_11_FCTL_MOREFRAGS) | 375 | if (fc & IEEE80211_FCTL_MOREFRAGS) |
376 | goto resubmit; | 376 | goto resubmit; |
377 | hlist_del_init(&frag->fnode); | 377 | hlist_del_init(&frag->fnode); |
378 | kfree(frag); | 378 | kfree(frag); |