From: Jeroen Vreeken <pe1rxq@amsat.org>
To: cliff white <cliffw@osdl.org>
Cc: netdev@oss.sgi.com
Subject: Re: complie problem - zd1201.c
Date: Tue, 29 Mar 2005 11:04:11 +0200 [thread overview]
Message-ID: <42491A0B.5060809@amsat.org> (raw)
In-Reply-To: <20050328135110.03d2c393@es175>
cliff white wrote:
>Looks like it's looking for the former location of some things.
>
>Complie error:
>---------------
>drivers/usb/net/zd1201.c:24:24: ieee802_11.h: No such file or directory
>drivers/usb/net/zd1201.c: In function `zd1201_usbrx':
>drivers/usb/net/zd1201.c:340: error: `IEEE802_11_SCTL_FRAG' undeclared (first use in this function)
>drivers/usb/net/zd1201.c:340: error: (Each undeclared identifier is reported only once
>drivers/usb/net/zd1201.c:340: error: for each function it appears in.)
>drivers/usb/net/zd1201.c:341: error: `IEEE802_11_FCTL_MOREFRAGS' undeclared (first use in this function)
>drivers/usb/net/zd1201.c:352: error: `IEEE802_11_DATA_LEN' undeclared (first use in this function)
>drivers/usb/net/zd1201.c:358: error: `IEEE802_11_SCTL_SEQ' undeclared (first use in this function)
> CC drivers/scsi/in2000.o
>-----------------------
>
>Is this the right way?
>
>
Looks ok to me...
Is this patch going into the netdev tree and pushed up to -mm when the
wireless stuff is done or should I keep an eye on it and resend it at
that time?
Jeroen
>------------------------
>diff -Nur a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c
>--- a/drivers/usb/net/zd1201.c 2005-03-28 13:31:03.000000000 -0800
>+++ b/drivers/usb/net/zd1201.c 2005-03-28 13:48:59.013988789 -0800
>@@ -21,7 +21,7 @@
> #include <linux/string.h>
> #include <linux/if_arp.h>
> #include <linux/firmware.h>
>-#include <ieee802_11.h>
>+#include <net/ieee80211.h>
> #include "zd1201.h"
>
> static struct usb_device_id zd1201_table[] = {
>@@ -337,25 +337,25 @@
> goto resubmit;
> }
>
>- if ((seq & IEEE802_11_SCTL_FRAG) ||
>- (fc & IEEE802_11_FCTL_MOREFRAGS)) {
>+ if ((seq & IEEE80211_SCTL_FRAG) ||
>+ (fc & IEEE80211_FCTL_MOREFRAGS)) {
> struct zd1201_frag *frag = NULL;
> char *ptr;
>
> if (datalen<14)
> goto resubmit;
>- if ((seq & IEEE802_11_SCTL_FRAG) == 0) {
>+ if ((seq & IEEE80211_SCTL_FRAG) == 0) {
> frag = kmalloc(sizeof(struct zd1201_frag*),
> GFP_ATOMIC);
> if (!frag)
> goto resubmit;
>- skb = dev_alloc_skb(IEEE802_11_DATA_LEN +14+2);
>+ skb = dev_alloc_skb(IEEE80211_DATA_LEN +14+2);
> if (!skb) {
> kfree(frag);
> goto resubmit;
> }
> frag->skb = skb;
>- frag->seq = seq & IEEE802_11_SCTL_SEQ;
>+ frag->seq = seq & IEEE80211_SCTL_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 @@
> goto resubmit;
> }
> hlist_for_each_entry(frag, node, &zd->fraglist, fnode)
>- if(frag->seq == (seq&IEEE802_11_SCTL_SEQ))
>+ if(frag->seq == (seq&IEEE80211_SCTL_SEQ))
> break;
> if (!frag)
> goto resubmit;
>@@ -372,7 +372,7 @@
> ptr = skb_put(skb, len);
> if (ptr)
> memcpy(ptr, data+8, len);
>- if (fc & IEEE802_11_FCTL_MOREFRAGS)
>+ if (fc & IEEE80211_FCTL_MOREFRAGS)
> goto resubmit;
> hlist_del_init(&frag->fnode);
> kfree(frag);
>---------------------------------
>cliffw
>
>
>
>
prev parent reply other threads:[~2005-03-29 9:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-03-28 21:51 complie problem - zd1201.c cliff white
2005-03-29 9:04 ` Jeroen Vreeken [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=42491A0B.5060809@amsat.org \
--to=pe1rxq@amsat.org \
--cc=cliffw@osdl.org \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.