[PATCH] 2.5.8-pre1 wavelan_cs

• Next message: J Sloan: "Re: Another BUG in page_alloc.c:108"
• Previous message: Keith Owens: "Re: [PATCH 2.5.5] do export vmalloc_to_page to modules..."
• Next in thread: Robert Love: "Re: [PATCH] 2.5.8-pre1 wavelan_cs"
• Reply: Robert Love: "Re: [PATCH] 2.5.8-pre1 wavelan_cs"
• Reply: Jeff Garzik: "Re: [PATCH] 2.5.8-pre1 wavelan_cs"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

-- 
----
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

• Next message: J Sloan: "Re: Another BUG in page_alloc.c:108"
• Previous message: Keith Owens: "Re: [PATCH 2.5.5] do export vmalloc_to_page to modules..."
• Next in thread: Robert Love: "Re: [PATCH] 2.5.8-pre1 wavelan_cs"
• Reply: Robert Love: "Re: [PATCH] 2.5.8-pre1 wavelan_cs"
• Reply: Jeff Garzik: "Re: [PATCH] 2.5.8-pre1 wavelan_cs"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Sun Apr 07 2002 - 22:00:13 EST