2.4.10p12 strange patch for drivers/net/starfire.c

2.4.10p12 strange patch for drivers/net/starfire.c

[Ward Fenton]

It seems that something went wrong with the starfire.c patch. The first
printk statement in the portion of the patch below is a syntax error.

diff -u --recursive --new-file v2.4.9/linux/drivers/net/starfire.c linux/drivers/net/starfire.c
--- v2.4.9/linux/drivers/net/starfire.c	Sun Aug 12 13:27:59 2001
+++ linux/drivers/net/starfire.c	Fri Sep  7 09:28:38 2001
[skipping about 100 lines]

@@ -768,6 +768,14 @@
 		np->phy_cnt = phy_idx;
 	}
 
+#ifdef ZEROCOPY
+	printk(KERN_INFO "%s: scatter-gather and hardware TCP cksumming enabled.\n",
+	       dev->name,
+#else  /* not ZEROCOPY */
+	printk(KERN_INFO "%s: scatter-gather and hardware TCP cksumming disabled.\n",
+	       dev->name);
+#endif /* not ZEROCOPY */
+
 	return 0;
 
 err_out_cleardev:

[patch continues]

[PATCH] Re: 2.4.10p12 strange patch for drivers/net/starfire.c

[Robert Love]

On Wed, 2001-09-19 at 16:35, Ward Fenton wrote:
> It seems that something went wrong with the starfire.c patch. The first
> printk statement in the portion of the patch below is a syntax error.

Hm, indeed.  A patch is attached... Linus, please apply.


diff -urN linux-2.4.10-pre12/drivers/net/starfire.c linux/drivers/net/starfire.c
--- linux-2.4.10-pre12/drivers/net/starfire.c	Wed Sep 19 02:53:15 2001
+++ linux/drivers/net/starfire.c	Wed Sep 19 17:04:44 2001
@@ -770,7 +770,7 @@
 
 #ifdef ZEROCOPY
 	printk(KERN_INFO "%s: scatter-gather and hardware TCP cksumming enabled.\n",
-	       dev->name,
+	       dev->name);
 #else  /* not ZEROCOPY */
 	printk(KERN_INFO "%s: scatter-gather and hardware TCP cksumming disabled.\n",
 	       dev->name);


-- 
Robert M. Love
rml at ufl.edu
rml at tech9.net