diff options
Diffstat (limited to 'net/ipv4/ipconfig.c')
-rw-r--r-- | net/ipv4/ipconfig.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index afa60b9a003f..ba882bec317a 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c | |||
@@ -12,7 +12,7 @@ | |||
12 | * BOOTP rewritten to construct and analyse packets itself instead | 12 | * BOOTP rewritten to construct and analyse packets itself instead |
13 | * of misusing the IP layer. num_bugs_causing_wrong_arp_replies--; | 13 | * of misusing the IP layer. num_bugs_causing_wrong_arp_replies--; |
14 | * -- MJ, December 1998 | 14 | * -- MJ, December 1998 |
15 | * | 15 | * |
16 | * Fixed ip_auto_config_setup calling at startup in the new "Linker Magic" | 16 | * Fixed ip_auto_config_setup calling at startup in the new "Linker Magic" |
17 | * initialization scheme. | 17 | * initialization scheme. |
18 | * - Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 08/11/1999 | 18 | * - Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 08/11/1999 |
@@ -98,8 +98,8 @@ | |||
98 | #define CONF_TIMEOUT_RANDOM (HZ) /* Maximum amount of randomization */ | 98 | #define CONF_TIMEOUT_RANDOM (HZ) /* Maximum amount of randomization */ |
99 | #define CONF_TIMEOUT_MULT *7/4 /* Rate of timeout growth */ | 99 | #define CONF_TIMEOUT_MULT *7/4 /* Rate of timeout growth */ |
100 | #define CONF_TIMEOUT_MAX (HZ*30) /* Maximum allowed timeout */ | 100 | #define CONF_TIMEOUT_MAX (HZ*30) /* Maximum allowed timeout */ |
101 | #define CONF_NAMESERVERS_MAX 3 /* Maximum number of nameservers | 101 | #define CONF_NAMESERVERS_MAX 3 /* Maximum number of nameservers |
102 | - '3' from resolv.h */ | 102 | - '3' from resolv.h */ |
103 | 103 | ||
104 | #define NONE __constant_htonl(INADDR_NONE) | 104 | #define NONE __constant_htonl(INADDR_NONE) |
105 | 105 | ||
@@ -365,7 +365,7 @@ static int __init ic_defaults(void) | |||
365 | * At this point we have no userspace running so need not | 365 | * At this point we have no userspace running so need not |
366 | * claim locks on system_utsname | 366 | * claim locks on system_utsname |
367 | */ | 367 | */ |
368 | 368 | ||
369 | if (!ic_host_name_set) | 369 | if (!ic_host_name_set) |
370 | sprintf(init_utsname()->nodename, "%u.%u.%u.%u", NIPQUAD(ic_myaddr)); | 370 | sprintf(init_utsname()->nodename, "%u.%u.%u.%u", NIPQUAD(ic_myaddr)); |
371 | 371 | ||
@@ -650,9 +650,9 @@ static void __init ic_bootp_init_ext(u8 *e) | |||
650 | *e++ = 40; | 650 | *e++ = 40; |
651 | e += 40; | 651 | e += 40; |
652 | 652 | ||
653 | *e++ = 57; /* set extension buffer size for reply */ | 653 | *e++ = 57; /* set extension buffer size for reply */ |
654 | *e++ = 2; | 654 | *e++ = 2; |
655 | *e++ = 1; /* 128+236+8+20+14, see dhcpd sources */ | 655 | *e++ = 1; /* 128+236+8+20+14, see dhcpd sources */ |
656 | *e++ = 150; | 656 | *e++ = 150; |
657 | 657 | ||
658 | *e++ = 255; /* End of the list */ | 658 | *e++ = 255; /* End of the list */ |
@@ -913,7 +913,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str | |||
913 | /* Parse extensions */ | 913 | /* Parse extensions */ |
914 | if (ext_len >= 4 && | 914 | if (ext_len >= 4 && |
915 | !memcmp(b->exten, ic_bootp_cookie, 4)) { /* Check magic cookie */ | 915 | !memcmp(b->exten, ic_bootp_cookie, 4)) { /* Check magic cookie */ |
916 | u8 *end = (u8 *) b + ntohs(b->iph.tot_len); | 916 | u8 *end = (u8 *) b + ntohs(b->iph.tot_len); |
917 | u8 *ext; | 917 | u8 *ext; |
918 | 918 | ||
919 | #ifdef IPCONFIG_DHCP | 919 | #ifdef IPCONFIG_DHCP |
@@ -1020,7 +1020,7 @@ drop: | |||
1020 | kfree_skb(skb); | 1020 | kfree_skb(skb); |
1021 | 1021 | ||
1022 | return 0; | 1022 | return 0; |
1023 | } | 1023 | } |
1024 | 1024 | ||
1025 | 1025 | ||
1026 | #endif | 1026 | #endif |
@@ -1080,7 +1080,7 @@ static int __init ic_dynamic(void) | |||
1080 | * seems to be a terrible waste of CPU time, but actually there is | 1080 | * seems to be a terrible waste of CPU time, but actually there is |
1081 | * only one process running at all, so we don't need to use any | 1081 | * only one process running at all, so we don't need to use any |
1082 | * scheduler functions. | 1082 | * scheduler functions. |
1083 | * [Actually we could now, but the nothing else running note still | 1083 | * [Actually we could now, but the nothing else running note still |
1084 | * applies.. - AC] | 1084 | * applies.. - AC] |
1085 | */ | 1085 | */ |
1086 | printk(KERN_NOTICE "Sending %s%s%s requests .", | 1086 | printk(KERN_NOTICE "Sending %s%s%s requests .", |
@@ -1156,7 +1156,7 @@ static int __init ic_dynamic(void) | |||
1156 | } | 1156 | } |
1157 | 1157 | ||
1158 | printk("IP-Config: Got %s answer from %u.%u.%u.%u, ", | 1158 | printk("IP-Config: Got %s answer from %u.%u.%u.%u, ", |
1159 | ((ic_got_reply & IC_RARP) ? "RARP" | 1159 | ((ic_got_reply & IC_RARP) ? "RARP" |
1160 | : (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"), | 1160 | : (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"), |
1161 | NIPQUAD(ic_servaddr)); | 1161 | NIPQUAD(ic_servaddr)); |
1162 | printk("my address is %u.%u.%u.%u\n", NIPQUAD(ic_myaddr)); | 1162 | printk("my address is %u.%u.%u.%u\n", NIPQUAD(ic_myaddr)); |
@@ -1286,7 +1286,7 @@ static int __init ip_auto_config(void) | |||
1286 | #endif | 1286 | #endif |
1287 | ic_first_dev->next) { | 1287 | ic_first_dev->next) { |
1288 | #ifdef IPCONFIG_DYNAMIC | 1288 | #ifdef IPCONFIG_DYNAMIC |
1289 | 1289 | ||
1290 | int retries = CONF_OPEN_RETRIES; | 1290 | int retries = CONF_OPEN_RETRIES; |
1291 | 1291 | ||
1292 | if (ic_dynamic() < 0) { | 1292 | if (ic_dynamic() < 0) { |
@@ -1308,14 +1308,14 @@ static int __init ip_auto_config(void) | |||
1308 | */ | 1308 | */ |
1309 | #ifdef CONFIG_ROOT_NFS | 1309 | #ifdef CONFIG_ROOT_NFS |
1310 | if (ROOT_DEV == Root_NFS) { | 1310 | if (ROOT_DEV == Root_NFS) { |
1311 | printk(KERN_ERR | 1311 | printk(KERN_ERR |
1312 | "IP-Config: Retrying forever (NFS root)...\n"); | 1312 | "IP-Config: Retrying forever (NFS root)...\n"); |
1313 | goto try_try_again; | 1313 | goto try_try_again; |
1314 | } | 1314 | } |
1315 | #endif | 1315 | #endif |
1316 | 1316 | ||
1317 | if (--retries) { | 1317 | if (--retries) { |
1318 | printk(KERN_ERR | 1318 | printk(KERN_ERR |
1319 | "IP-Config: Reopening network devices...\n"); | 1319 | "IP-Config: Reopening network devices...\n"); |
1320 | goto try_try_again; | 1320 | goto try_try_again; |
1321 | } | 1321 | } |
@@ -1443,8 +1443,8 @@ static int __init ip_auto_config_setup(char *addrs) | |||
1443 | 1443 | ||
1444 | ic_set_manually = 1; | 1444 | ic_set_manually = 1; |
1445 | 1445 | ||
1446 | ic_enable = (*addrs && | 1446 | ic_enable = (*addrs && |
1447 | (strcmp(addrs, "off") != 0) && | 1447 | (strcmp(addrs, "off") != 0) && |
1448 | (strcmp(addrs, "none") != 0)); | 1448 | (strcmp(addrs, "none") != 0)); |
1449 | if (!ic_enable) | 1449 | if (!ic_enable) |
1450 | return 1; | 1450 | return 1; |