Fix DHCP ipconfig.c

PATCH In review Russell King 2 participants 2 messages Sep 10, 2004

Subsystems (2)

Networking IPv4/IPv6

lore

Share & tools

lore

Russell King

author

2004-09-10 09:45 UTC #0 lore raw

PATCH 1/1 Fix DHCP ipconfig.c

bk-curr seems to be a little sick here:

CC net/ipv4/ipconfig.o
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.)

and here's the medicine:

===== net/ipv4/ipconfig.c 1.41 vs edited =====

net/ipv4/ipconfig.c +1 -1

@@ -913,7 +913,7 @@
 #ifdef IPCONFIG_DHCP
 		if (ic_proto_enabled & IC_USE_DHCP) {
 			u32 server_id = INADDR_NONE;
-			int mt = 0;
+			int mt = 0, i;
 
 			ext = &b->exten[4];
 			while (ext < end && *ext != 0xff) {

Signature · 4 lines

Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 PCMCIA      - http://pcmcia.arm.linux.org.uk/
                 2.6 Serial core

[email protected]

2004-09-10 10:47 UTC #1 lore raw

Quoted 9 lines · Russell King

bk-curr seems to be a little sick here:
CC net/ipv4/ipconfig.o
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.)
and here's the medicine:

And here's better one:

net/ipv4/ipconfig.c +1 -3

diff -urN RC9-rc1-bk16-base/net/ipv4/ipconfig.c RC9-rc1-bk16-current/net/ipv4/ipconfig.c
@@ -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(b->hw_addr, dev->dev_addr, dev->addr_len) != 0)
 					goto drop_unlock;
 
 				/* Yeah! */