aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-07-10 01:25:18 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-10 01:25:18 -0400
commit405fd707196d596f59a510d176dedc979c1ae34b (patch)
treee793907b69afcea0f6cf3d53dfe34a13ee6675ce
parent5edbf7dfeac62ed062e46a1ebf78da764ff23205 (diff)
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>
-rw-r--r--net/ipv4/ipconfig.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index f02f594d04c5..5bbef4fdcb43 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1217,10 +1217,10 @@ static int __init ic_dynamic(void)
1217 get_random_bytes(&timeout, sizeof(timeout)); 1217 get_random_bytes(&timeout, sizeof(timeout));
1218 timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned int) CONF_TIMEOUT_RANDOM); 1218 timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned int) CONF_TIMEOUT_RANDOM);
1219 for (;;) { 1219 for (;;) {
1220#ifdef IPCONFIG_BOOTP
1220 /* Track the device we are configuring */ 1221 /* Track the device we are configuring */
1221 ic_dev_xid = d->xid; 1222 ic_dev_xid = d->xid;
1222 1223
1223#ifdef IPCONFIG_BOOTP
1224 if (do_bootp && (d->able & IC_BOOTP)) 1224 if (do_bootp && (d->able & IC_BOOTP))
1225 ic_bootp_send_if(d, jiffies - start_jiffies); 1225 ic_bootp_send_if(d, jiffies - start_jiffies);
1226#endif 1226#endif