Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+1 -1
+1 -1
net/ipv4/ipconfig.c
··· 1217 1217 get_random_bytes(&timeout, sizeof(timeout)); 1218 1218 timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned int) CONF_TIMEOUT_RANDOM); 1219 1219 for (;;) { 1220 + #ifdef IPCONFIG_BOOTP 1220 1221 /* Track the device we are configuring */ 1221 1222 ic_dev_xid = d->xid; 1222 1223 1223 - #ifdef IPCONFIG_BOOTP 1224 1224 if (do_bootp && (d->able & IC_BOOTP)) 1225 1225 ic_bootp_send_if(d, jiffies - start_jiffies); 1226 1226 #endif