2.6.9-rc1-bk16: DHCPACK, compile time error ...

2.6.9-rc1-bk16: DHCPACK, compile time error ...

[Herbert Poetzl]

Hi Andrew!


diff -Nru a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
--- a/net/ipv4/ipconfig.c	2004-07-05 16:26:17 -07:00
+++ b/net/ipv4/ipconfig.c	2004-09-07 15:33:17 -07:00
@@ -966,6 +966,11 @@
 				break;
 
 			case DHCPACK:
+				for (i = 0; (dev->dev_addr[i] == b->hw_addr[i])
+						&& (i < dev->addr_len); i++);
+				if (i < dev->addr_len)
+					goto drop_unlock;
+
 				/* Yeah! */
 				break;
 

(from patch-2.6.9-rc1-bk16.bz2) results in:

net/ipv4/ipconfig.c: In function `ic_bootp_recv':
net/ipv4/ipconfig.c:969: error: `i' undeclared (first use in this function)
net/ipv4/ipconfig.c:969: error: (Each undeclared identifier is reported only once
net/ipv4/ipconfig.c:969: error: for each function it appears in.)


--- net/ipv4/ipconfig.c.orig	2004-09-09 15:18:26.000000000 +0200
+++ net/ipv4/ipconfig.c	2004-09-09 16:12:44.000000000 +0200
@@ -913,7 +913,7 @@ static int __init ic_bootp_recv(struct s
 #ifdef IPCONFIG_DHCP
 		if (ic_proto_enabled & IC_USE_DHCP) {
 			u32 server_id = INADDR_NONE;
-			int mt = 0;
+			int i, mt = 0;
 
 			ext = &b->exten[4];
 			while (ext < end && *ext != 0xff) {

fixes it ...

best,
Herbert

Re: 2.6.9-rc1-bk16: DHCPACK, compile time error ...

[David S. Miller]

On Thu, 9 Sep 2004 16:14:04 +0200
Herbert Poetzl <herbert@13thfloor.at> wrote:

> net/ipv4/ipconfig.c:969: error: `i' undeclared (first use in this function)
> net/ipv4/ipconfig.c:969: error: (Each undeclared identifier is reported only once
> net/ipv4/ipconfig.c:969: error: for each function it appears in.)

Already fixed in my tree like so, on it's way to Linus:

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/09/08 17:38:20-07:00 peter@pantasys.com 
#   [IPV4]: Fix DHCPACK checking in ipconfig.c
#   
#   Signed-off-by: Peter Buckingham <peter@pantasys.com>
#   Signed-off-by: David S. Miller <davem@davemloft.net>
# 
# net/ipv4/ipconfig.c
#   2004/09/08 17:37:44-07:00 peter@pantasys.com +1 -3
#   [IPV4]: Fix DHCPACK checking in ipconfig.c
# 
diff -Nru a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
--- a/net/ipv4/ipconfig.c	2004-09-09 08:31:35 -07:00
+++ b/net/ipv4/ipconfig.c	2004-09-09 08:31:35 -07:00
@@ -966,9 +966,7 @@
 				break;
 
 			case DHCPACK:
-				for (i = 0; (dev->dev_addr[i] == b->hw_addr[i])
-						&& (i < dev->addr_len); i++);
-				if (i < dev->addr_len)
+				if (memcmp(dev->dev_addr, b->hw_addr, dev->addr_len) != 0)
 					goto drop_unlock;
 
 				/* Yeah! */