Re: 2.5.61: tms380tr.c no longer compiles

[Jochen Friedrich]

Hi Adrian,

> drivers/net/tokenring/tms380tr.c:260: invalid type argument of `->'
> drivers/net/tokenring/tms380tr.c:260: invalid type argument of `->'
> drivers/net/tokenring/tms380tr.c:260: invalid type argument of `->'
> drivers/net/tokenring/tms380tr.c:260: invalid type argument of `->'
> drivers/net/tokenring/tms380tr.c:260: invalid type argument of `->'
> drivers/net/tokenring/tms380tr.c:260: invalid type argument of `->'
> drivers/net/tokenring/tms380tr.c: In function `tms380tr_init_adapter':
> drivers/net/tokenring/tms380tr.c:1461: warning: long unsigned int

I wonder why my version of gcc didn't catch that one on my Alpha...

Please try this one:

--- tms380tr.c.orig     2003-02-15 09:28:42.000000000 +0100
+++ tms380tr.c  2003-02-15 10:35:16.000000000 +0100
@@ -257,7 +257,7 @@
        int err;

        /* init the spinlock */
-       spin_lock_init(tp->lock);
+       spin_lock_init(&tp->lock);

        /* Reset the hardware here. Don't forget to set the station address. */

@@ -1458,7 +1458,7 @@
        if(tms380tr_debug > 3)
        {
                printk(KERN_DEBUG "%s: buffer (real): %lx\n", dev->name, (long) &tp->scb);
-               printk(KERN_DEBUG "%s: buffer (virt): %lx\n", dev->name, (long) ((char *)&tp->scb - (char *)tp) + tp->dmabuffer);
+               printk(KERN_DEBUG "%s: buffer (virt): %lx\n", dev->name, (long) ((char *)&tp->scb - (char *)tp) + (long) tp->dmabuffer);
                printk(KERN_DEBUG "%s: buffer (DMA) : %lx\n", dev->name, (long) tp->dmabuffer);
                printk(KERN_DEBUG "%s: buffer (tp)  : %lx\n", dev->name, (long) tp);
        }

Thanks,
--jochen