From: flaniganr@intel.co.jp
To: linux-kernel@vger.kernel.org
Cc: jt@hpl.hp.com, dhinds@zen.stanford.edu
Subject: [PATCH] 2.5.8-pre1 wavelan_cs
Date: 04 Apr 2002 15:54:14 +0900 [thread overview]
Message-ID: <87vgb8x8bt.fsf@hazuki.jp.intel.com> (raw)
not sure if i did this right, so if you
have any suggestions/comments please tell me.
Basically 2.5.8-pre1 fails to compile with:
In file included from wavelan_cs.c:59:
wavelan_cs.p.h:495:33: warning: extra tokens at end of #undef directive
wavelan_cs.c: In function `wv_pcmcia_config':
wavelan_cs.c:4480: structure has no member named `rmem_start'
wavelan_cs.c:4482: structure has no member named `rmem_end'
make[3]: *** [wavelan_cs.o] Error 1
due to the removal of rmem_{start,end} from net_device.
here is the patch [tested]:
diff -ru a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
--- a/drivers/net/wireless/wavelan_cs.c Tue Mar 19 05:37:16 2002
+++ b/drivers/net/wireless/wavelan_cs.c Thu Apr 4 13:17:43 2002
@@ -4383,6 +4383,7 @@
tuple_t tuple;
cisparse_t parse;
struct net_device * dev;
+ struct net_local * lp;
int i;
u_char buf[64];
win_req_t req;
@@ -4390,6 +4391,7 @@
handle = link->handle;
dev = (device *) link->priv;
+ lp = (net_local *)dev->priv;
#ifdef DEBUG_CONFIG_TRACE
printk(KERN_DEBUG "->wv_pcmcia_config(0x%p)\n", link);
@@ -4477,9 +4479,9 @@
break;
}
- dev->rmem_start = dev->mem_start =
+ lp->rmem_start = dev->mem_start =
(u_long)ioremap(req.Base, req.Size);
- dev->rmem_end = dev->mem_end = dev->mem_start + req.Size;
+ lp->rmem_end = dev->mem_end = dev->mem_start + req.Size;
mem.CardOffset = 0; mem.Page = 0;
i = CardServices(MapMemPage, link->win, &mem);
diff -ru a/drivers/net/wireless/wavelan_cs.p.h b/drivers/net/wireless/wavelan_cs.p.h
--- a/drivers/net/wireless/wavelan_cs.p.h Tue Mar 19 05:37:09 2002
+++ b/drivers/net/wireless/wavelan_cs.p.h Thu Apr 4 14:05:43 2002
@@ -638,6 +638,9 @@
int rfp; /* Last DMA machine receive pointer */
int overrunning; /* Receiver overrun flag */
+ unsigned long rmem_start;
+ unsigned long rmem_end;
+
#ifdef WIRELESS_EXT
iw_stats wstats; /* Wireless specific stats */
#endif
--
----
next reply other threads:[~2002-04-04 6:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-04-04 6:54 flaniganr [this message]
2002-04-04 7:11 ` [PATCH] 2.5.8-pre1 wavelan_cs Robert Love
2002-04-04 7:18 ` Jeff Garzik
2002-04-04 17:40 ` Jean Tourrilhes
2002-04-04 19:25 ` Jeff Garzik
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=87vgb8x8bt.fsf@hazuki.jp.intel.com \
--to=flaniganr@intel.co.jp \
--cc=dhinds@zen.stanford.edu \
--cc=jt@hpl.hp.com \
--cc=linux-kernel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).