net-2.6.24 build broken (allyesconfig)

net-2.6.24 build broken (allyesconfig)

[Ilpo Järvinen]

Hi,

$ git-reset --hard net-2.6.24-origin
HEAD is now at e2eb35e... [ATM]: Fix build errors after conversion to pr_debug()
$ make allyesconfig
...
$ make bzImage
...
  CC      drivers/net/82596.o
drivers/net/82596.c:1618:1: error: unterminated argument list invoking 
macro "DEB"
drivers/net/82596.c: In function 'set_multicast_list':
drivers/net/82596.c:1564: error: 'DEB' undeclared (first use in this 
function)
drivers/net/82596.c:1564: error: (Each undeclared identifier is reported 
only once
drivers/net/82596.c:1564: error: for each function it appears in.)
drivers/net/82596.c:1564: error: expected ';' at end of input
make[1]: *** [drivers/net/82596.o] Error 1
make: *** [drivers/net/82596.o] Error 2


Hmm, I would guess that "[NET]: Introduce MAC_FMT/MAC_ARG" broken it, 
though didn't verify it.

The fix is left as an exercise of the reader (i.e., the solution wasn't 
too obvious for me :-) )...


--
 i.

[NET] 82596: Add missing parenthesis

[Thomas Graf]

Signed-off-by: Thomas Graf <tgraf@suug.ch>

Index: net-2.6.24/drivers/net/82596.c
===================================================================
--- net-2.6.24.orig/drivers/net/82596.c	2007-08-27 14:43:16.000000000 +0200
+++ net-2.6.24/drivers/net/82596.c	2007-08-27 14:43:51.000000000 +0200
@@ -1562,7 +1562,7 @@ static void set_multicast_list(struct ne
 			memcpy(cp, dmi->dmi_addr, 6);
 			if (i596_debug > 1)
 				DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address " MAC_FMT "\n",
-						dev->name, MAC_ARG(cp));
+						dev->name, MAC_ARG(cp)));
 		}
 		i596_add_cmd(dev, &cmd->cmd);
 	}

Re: net-2.6.24 build broken (allyesconfig)

[Johannes Berg]

On Mon, 2007-08-27 at 15:32 +0300, Ilpo Järvinen wrote:

> drivers/net/82596.c:1618:1: error: unterminated argument list invoking 
> macro "DEB"

> Hmm, I would guess that "[NET]: Introduce MAC_FMT/MAC_ARG" broken it, 
> though didn't verify it.
> 
> The fix is left as an exercise of the reader (i.e., the solution wasn't 
> too obvious for me :-) )...

Yup, my fault, sorry about that.

From: Johannes Berg <johannes@sipsolutions.net>
Subject: fix MAC_FMT/MAC_ARG in 82596.c

This fixes a typo in commit f98d4ca4986fec.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

---
 drivers/net/82596.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- netdev-2.6.orig/drivers/net/82596.c	2007-08-27 14:48:19.674646075 +0200
+++ netdev-2.6/drivers/net/82596.c	2007-08-27 14:48:21.674646075 +0200
@@ -1562,7 +1562,7 @@ static void set_multicast_list(struct ne
 			memcpy(cp, dmi->dmi_addr, 6);
 			if (i596_debug > 1)
 				DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address " MAC_FMT "\n",
-						dev->name, MAC_ARG(cp));
+						dev->name, MAC_ARG(cp)));
 		}
 		i596_add_cmd(dev, &cmd->cmd);
 	}