[patch] 2.5.69-dj1: tlan.c doesn't compile

Adrian Bunk (bunk@fs.tum.de)
Sun, 11 May 2003 10:54:11 +0200


<-- snip -->

...
gcc -Wp,-MD,drivers/net/.tlan.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=tlan -DKBUILD_MODNAME=tlan -c -o drivers/net/tlan.o
drivers/net/tlan.c
drivers/net/tlan.c:1539:21: warning: extra tokens at end of #ifdef directive
drivers/net/tlan.c:1540:2: #error "Not 64bit clean"
make[2]: *** [drivers/net/tlan.o] Error 1

<-- snip -->

This is a bug only present in -dj, the fix is simple:

--- linux-2.5.69-dj1/drivers/net/tlan.c.old 2003-05-11 10:45:40.000000000 +0200
+++ linux-2.5.69-dj1/drivers/net/tlan.c 2003-05-11 10:47:19.000000000 +0200
@@ -1536,7 +1536,7 @@
t = (void *) skb_put( new_skb, TLAN_MAX_FRAME_SIZE );
head_list->buffer[0].address = pci_map_single(priv->pciDev, new_skb->data, TLAN_MAX_FRAME_SIZE, PCI_DMA_FROMDEVICE);
head_list->buffer[8].address = (u32) t;
-#ifdef BITS_PER_LONG==64
+#if BITS_PER_LONG == 64
#error "Not 64bit clean"
#endif
head_list->buffer[9].address = (u32) new_skb;

cu
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

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