Commit da11d5bb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Stephen Hemminger

[PATCH] 2.6.x experimental net driver queue fix

On Wed, 19 Nov 2003, Sam Creasey wrote:
> On Tue, 18 Nov 2003, Geert Uytterhoeven wrote:
> > On Mon, 17 Nov 2003, Geert Uytterhoeven wrote:
> > > On Sun, 16 Nov 2003, Jeff Garzik wrote:
> > > > Yet more updates.  Syncing with Andrew Morton, and more syncing with Al
> > > > Viro.
> > > >
> > > > No users of init_etherdev remain in the tree.  (yay!)
> > >
> > > Here are some (untested, except for cross-gcc) fixes for the m68k-related
> > > drivers:
> >
> > I forget to test the Sun-3 drivers:
> >   - sun3_82586.c:
> >       o add missing casts to iounmap() calls
> >       o fix parameter of free_netdev()
> >   - sun3lance.c: add missing casts to iounmap() calls
> >
> > Note that sun3_82586.c no longer compiles since SUN3_82586_TOTAL_SIZE is not
> > defined. Sammy, is it OK to use PAGE_SIZE for that, since that's what's passed
> > to ioremap()?
>
> Should be...  I looked back through a few versions of the code, and I'm
> not even sure what SUN3_82586_TOTAL_SIZE even was (appears I commented
> that line out long ago anyway).  (I'm also amazed just how much of that
> driver I've forgotten in the last year or two :)

OK, so here's a additional patch that fixes that:
parent 35a620a2
......@@ -55,6 +55,7 @@ static int fifo=0x8; /* don't change */
#define DEBUG /* debug on */
#define SYSBUSVAL 0 /* 16 Bit */
#define SUN3_82586_TOTAL_SIZE PAGE_SIZE
#define sun3_attn586() {*(volatile unsigned char *)(dev->base_addr) |= IEOB_ATTEN; *(volatile unsigned char *)(dev->base_addr) &= ~IEOB_ATTEN;}
#define sun3_reset586() {*(volatile unsigned char *)(dev->base_addr) = 0; udelay(100); *(volatile unsigned char *)(dev->base_addr) = IEOB_NORSET;}
......@@ -298,7 +299,7 @@ struct net_device * __init sun3_82586_probe(int unit)
if (found)
return ERR_PTR(-ENODEV);
ioaddr = (unsigned long)ioremap(IE_OBIO, PAGE_SIZE);
ioaddr = (unsigned long)ioremap(IE_OBIO, SUN3_82586_TOTAL_SIZE);
if (!ioaddr)
return ERR_PTR(-ENOMEM);
found = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment