[PATCH wireless-dev 4/5] zd1201: Switch to d80211.h

[Michael Wu]

zd1201: Switch to d80211.h

This patch "converts" the zd1201 driver to use d80211.h instead
of ieee80211.h

Signed-off-by: Michael Wu <[EMAIL PROTECTED]>
---

 drivers/net/wireless/zd1201.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 662ecc8..c08557a 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -21,7 +21,7 @@ #include <net/iw_handler.h>
 #include <linux/string.h>
 #include <linux/if_arp.h>
 #include <linux/firmware.h>
-#include <net/ieee80211.h>
+#include <net/d80211.h>
 #include "zd1201.h"
 
 static struct usb_device_id zd1201_table[] = {
@@ -338,14 +338,14 @@ static void zd1201_usbrx(struct urb *urb
                        goto resubmit;
                }
                        
-               if ((seq & IEEE80211_SCTL_FRAG) ||
-                   (fc & IEEE80211_FCTL_MOREFRAGS)) {
+               if (WLAN_GET_SEQ_FRAG(seq) ||
+                   (fc & WLAN_FC_MOREFRAG)) {
                        struct zd1201_frag *frag = NULL;
                        char *ptr;
 
                        if (datalen<14)
                                goto resubmit;
-                       if ((seq & IEEE80211_SCTL_FRAG) == 0) {
+                       if (WLAN_GET_SEQ_FRAG(seq) == 0) {
                                frag = kmalloc(sizeof(*frag), GFP_ATOMIC);
                                if (!frag)
                                        goto resubmit;
@@ -355,7 +355,7 @@ static void zd1201_usbrx(struct urb *urb
                                        goto resubmit;
                                }
                                frag->skb = skb;
-                               frag->seq = seq & IEEE80211_SCTL_SEQ;
+                               frag->seq = WLAN_GET_SEQ_SEQ(seq);
                                skb_reserve(skb, 2);
                                memcpy(skb_put(skb, 12), &data[datalen-14], 12);
                                memcpy(skb_put(skb, 2), &data[6], 2);
@@ -364,7 +364,7 @@ static void zd1201_usbrx(struct urb *urb
                                goto resubmit;
                        }
                        hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
-                               if (frag->seq == (seq&IEEE80211_SCTL_SEQ))
+                               if (frag->seq == WLAN_GET_SEQ_SEQ(seq))
                                        break;
                        if (!frag)
                                goto resubmit;
@@ -372,7 +372,7 @@ static void zd1201_usbrx(struct urb *urb
                        ptr = skb_put(skb, len);
                        if (ptr)
                                memcpy(ptr, data+8, len);
-                       if (fc & IEEE80211_FCTL_MOREFRAGS)
+                       if (fc & WLAN_FC_MOREFRAG)
                                goto resubmit;
                        hlist_del_init(&frag->fnode);
                        kfree(frag);

pgp2y2wMLXDX8.pgp
Description: PGP signature