Commit edc83a99 authored by Frank Davis's avatar Frank Davis Committed by Linus Torvalds

[PATCH] net/ipv4/ipconfig.c minor fix

Hello all,
    The following patch fixes two compile warnings 'defined but not used'.
Since the label and int are only used for IPCONFIG_DYNAMIC, appropriate
fixes were made to remove the warnings.
parent 27b7e752
...@@ -1110,7 +1110,6 @@ static int pnp_get_info(char *buffer, char **start, ...@@ -1110,7 +1110,6 @@ static int pnp_get_info(char *buffer, char **start,
static int __init ip_auto_config(void) static int __init ip_auto_config(void)
{ {
int retries = CONF_OPEN_RETRIES;
unsigned long jiff; unsigned long jiff;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
...@@ -1121,8 +1120,9 @@ static int __init ip_auto_config(void) ...@@ -1121,8 +1120,9 @@ static int __init ip_auto_config(void)
return 0; return 0;
DBG(("IP-Config: Entered.\n")); DBG(("IP-Config: Entered.\n"));
#ifdef IPCONFIG_DYNAMIC
try_try_again: try_try_again:
#endif
/* Give hardware a chance to settle */ /* Give hardware a chance to settle */
jiff = jiffies + CONF_PRE_OPEN; jiff = jiffies + CONF_PRE_OPEN;
while (time_before(jiffies, jiff)) while (time_before(jiffies, jiff))
...@@ -1152,6 +1152,8 @@ static int __init ip_auto_config(void) ...@@ -1152,6 +1152,8 @@ static int __init ip_auto_config(void)
ic_first_dev->next) { ic_first_dev->next) {
#ifdef IPCONFIG_DYNAMIC #ifdef IPCONFIG_DYNAMIC
int retries = CONF_OPEN_RETRIES;
if (ic_dynamic() < 0) { if (ic_dynamic() < 0) {
ic_close_devs(); ic_close_devs();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment