lkml.org 
[lkml]   [2014]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
SubjectRe: randconfig build error with next-20140710, in net/ipv4/ipconfig.c
From
From: Jim Davis <jim.epost@gmail.com>
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@davemloft.net>
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@davemloft.net>
---
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
\
 
 \ /
  Last update: 2014-07-10 22:41    [W:0.051 / U:2.020 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site