[2.5 patch] fix the compilation of drivers/net/tokenring/tms380tr.c (fwd)

From: Adrian Bunk (bunk@fs.tum.de)
Date: Tue Mar 18 2003 - 07:40:50 EST

The patch in the mail forwarded below is still needed in 2.5.65.

Please apply
Adrian

----- Forwarded message from Adrian Bunk <bunk@fs.tum.de> -----

Date: Wed, 5 Mar 2003 21:34:50 +0100
From: Adrian Bunk <bunk@fs.tum.de>
To: Linus Torvalds <torvalds@transmeta.com>
Cc: Jochen Friedrich <jochen@scram.de>, trivial@rustcorp.com.au
Subject: [2.5 patch] fix the compilation of drivers/net/tokenring/tms380tr.c

Since 2.5.61 compilation of drivers/net/tokenring/tms380tr.c fails with
the following error:

<-- snip -->

...
  gcc -Wp,-MD,drivers/net/tokenring/.tms380tr.o.d -D__KERNEL__ -Iinclude
-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing
-fno-common -pipe -mpreferred-stack-boundary=2 -march=k6
-Iinclude/asm-i386/mach-default -nostdinc -iwithprefix include
-DKBUILD_BASENAME=tms380tr -DKBUILD_MODNAME=tms380tr -c -o
drivers/net/tokenring/tms380tr.o drivers/net/tokenring/tms380tr.c
drivers/net/tokenring/tms380tr.c: In function `tms380tr_open':
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 format, different type arg (arg3)
make[3]: *** [drivers/net/tokenring/tms380tr.o] Error 1

<-- snip -->

The following patch by Jochen Friedrich fixes both the compile error and
the warning:

--- linux-2.5.64-notfull/drivers/net/tokenring/tms380tr.c.old 2003-03-05 21:22:59.000000000 +0100
+++ linux-2.5.64-notfull/drivers/net/tokenring/tms380tr.c 2003-03-05 21:27:18.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);
         }

Please apply
Adrian 

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

----- End forwarded message -----

-
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/

This archive was generated by hypermail 2b29 : Sun Mar 23 2003 - 22:00:23 EST