PATCH: __setup(ip_auto_config_setup)

Arnaldo Carvalho de Melo (acme@conectiva.com.br)
Wed, 11 Aug 1999 18:50:36 -0300 (EST)


Linus,

Please apply the following patch to make ip and nfsaddrs kernel
parameters work in the new __setup scheme. Tested with etherboot and
2.3.13.

--- linux.orig/net/ipv4/ipconfig.c Wed Aug 11 15:03:22 1999
+++ linux/net/ipv4/ipconfig.c Wed Aug 11 15:31:22 1999
@@ -12,6 +12,10 @@
* BOOTP rewritten to construct and analyse packets itself instead
* of misusing the IP layer. num_bugs_causing_wrong_arp_replies--;
* -- MJ, December 1998
+ *
+ * Fixed ip_auto_config_setup calling at startup in the new "Linker Magic"
+ * initialization scheme.
+ * - Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 08/11/1999
*/

#include <linux/config.h>
@@ -912,7 +916,7 @@
return 0;
}

-void __init ip_auto_config_setup(char *addrs, int *ints)
+static int __init ip_auto_config_setup(char *addrs)
{
char *cp, *ip, *dp;
int num = 0;
@@ -920,10 +924,10 @@
ic_set_manually = 1;
if (!strcmp(addrs, "off")) {
ic_enable = 0;
- return;
+ return 1;
}
if (ic_proto_name(addrs))
- return;
+ return 1;

/* Parse the whole string */
ip = addrs;
@@ -971,4 +975,14 @@
ip = cp;
num++;
}
+
+ return 0;
}
+
+static int __init nfsaddrs_config_setup(char *addrs)
+{
+ return ip_auto_config_setup(addrs);
+}
+
+__setup("ip=", ip_auto_config_setup);
+__setup("nfsaddrs=", nfsaddrs_config_setup);

- Arnaldo

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/