diff options
author | Paul Mackerras | 2007-12-21 12:21:08 +0100 |
---|---|---|
committer | Paul Mackerras | 2007-12-21 12:21:08 +0100 |
commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /net/ipv4/ipconfig.c | |
parent | [POWERPC] Make non-PCI build work again (diff) | |
parent | Linux 2.6.24-rc6 (diff) | |
download | kernel-qcow2-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.tar.gz kernel-qcow2-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.tar.xz kernel-qcow2-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.zip |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/ipv4/ipconfig.c')
-rw-r--r-- | net/ipv4/ipconfig.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c index c5c107a01823..96400b0bd08a 100644 --- a/net/ipv4/ipconfig.c +++ b/net/ipv4/ipconfig.c @@ -1396,25 +1396,7 @@ late_initcall(ip_auto_config); /* * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel - * command line parameter. It consists of option fields separated by colons in - * the following order: - * - * <client-ip>:<server-ip>:<gw-ip>:<netmask>:<host name>:<device>:<PROTO> - * - * Any of the fields can be empty which means to use a default value: - * <client-ip> - address given by BOOTP or RARP - * <server-ip> - address of host returning BOOTP or RARP packet - * <gw-ip> - none, or the address returned by BOOTP - * <netmask> - automatically determined from <client-ip>, or the - * one returned by BOOTP - * <host name> - <client-ip> in ASCII notation, or the name returned - * by BOOTP - * <device> - use all available devices - * <PROTO>: - * off|none - don't do autoconfig at all (DEFAULT) - * on|any - use any configured protocol - * dhcp|bootp|rarp - use only the specified protocol - * both - use both BOOTP and RARP (not DHCP) + * command line parameter. See Documentation/nfsroot.txt. */ static int __init ic_proto_name(char *name) { |