Re: randconfig build error with next-20140710, in net/ipv4/ipconfig.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Jim Davis <jim.epost@xxxxxxxxx>
Date: Thu, 10 Jul 2014 10:07:50 -0700

> Building with the attached random configuration file,
> 
> net/ipv4/ipconfig.c: In function ʽic_dynamicʼ:
> net/ipv4/ipconfig.c:1221:3: error: ʽic_dev_xidʼ undeclared (first use
> in this function)
>    ic_dev_xid = d->xid;
>    ^
> net/ipv4/ipconfig.c:1221:3: note: each undeclared identifier is
> reported only once for each function it appears in
> make[2]: *** [net/ipv4/ipconfig.o] Error 1

Should be fixed by:

>From 405fd707196d596f59a510d176dedc979c1ae34b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@xxxxxxxxxxxxx>
Date: Wed, 9 Jul 2014 22:25:18 -0700
Subject: [PATCH] ipconfig: Only bootp paths should reference ic_dev_xid.

It is only tested, and declared, in the bootp code.

So, in ic_dynamic() guard it's setting with IPCONFIG_BOOTP.

Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
---
 net/ipv4/ipconfig.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index f02f594..5bbef4f 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1217,10 +1217,10 @@ static int __init ic_dynamic(void)
 	get_random_bytes(&timeout, sizeof(timeout));
 	timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned int) CONF_TIMEOUT_RANDOM);
 	for (;;) {
+#ifdef IPCONFIG_BOOTP
 		/* Track the device we are configuring */
 		ic_dev_xid = d->xid;
 
-#ifdef IPCONFIG_BOOTP
 		if (do_bootp && (d->able & IC_BOOTP))
 			ic_bootp_send_if(d, jiffies - start_jiffies);
 #endif
-- 
1.7.11.7

?τθΊ{.nΗ+?·???­?+%?Λ?±ιέΆ??w?Ί{.nΗ+?·??{±ώw±·ψ§Ά?ʽά¨}©?²Ζ zΪ&j:+v?¨ώψ―ω?w?ώ?ΰ2?ή?¨θ­Ϊ&ʼ)ίʽ«aΆΪ??ϋΰzΏδzΉή?ϊ+?ω???έʼj??wθώf





[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux