Commit b37f4d7b011955c84cdbb8c370927d93701fb174

Authored by Eldad Zack
Committed by David S. Miller
1 parent 88c16dc3bb

net/ipv4/ipconfig: neaten __setup placement

The __setup macro should follow the corresponding setup handler.

Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 3 deletions Inline Diff

1 /* 1 /*
2 * Automatic Configuration of IP -- use DHCP, BOOTP, RARP, or 2 * Automatic Configuration of IP -- use DHCP, BOOTP, RARP, or
3 * user-supplied information to configure own IP address and routes. 3 * user-supplied information to configure own IP address and routes.
4 * 4 *
5 * Copyright (C) 1996-1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz> 5 * Copyright (C) 1996-1998 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
6 * 6 *
7 * Derived from network configuration code in fs/nfs/nfsroot.c, 7 * Derived from network configuration code in fs/nfs/nfsroot.c,
8 * originally Copyright (C) 1995, 1996 Gero Kuhlmann and me. 8 * originally Copyright (C) 1995, 1996 Gero Kuhlmann and me.
9 * 9 *
10 * BOOTP rewritten to construct and analyse packets itself instead 10 * BOOTP rewritten to construct and analyse packets itself instead
11 * of misusing the IP layer. num_bugs_causing_wrong_arp_replies--; 11 * of misusing the IP layer. num_bugs_causing_wrong_arp_replies--;
12 * -- MJ, December 1998 12 * -- MJ, December 1998
13 * 13 *
14 * Fixed ip_auto_config_setup calling at startup in the new "Linker Magic" 14 * Fixed ip_auto_config_setup calling at startup in the new "Linker Magic"
15 * initialization scheme. 15 * initialization scheme.
16 * - Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 08/11/1999 16 * - Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 08/11/1999
17 * 17 *
18 * DHCP support added. To users this looks like a whole separate 18 * DHCP support added. To users this looks like a whole separate
19 * protocol, but we know it's just a bag on the side of BOOTP. 19 * protocol, but we know it's just a bag on the side of BOOTP.
20 * -- Chip Salzenberg <chip@valinux.com>, May 2000 20 * -- Chip Salzenberg <chip@valinux.com>, May 2000
21 * 21 *
22 * Ported DHCP support from 2.2.16 to 2.4.0-test4 22 * Ported DHCP support from 2.2.16 to 2.4.0-test4
23 * -- Eric Biederman <ebiederman@lnxi.com>, 30 Aug 2000 23 * -- Eric Biederman <ebiederman@lnxi.com>, 30 Aug 2000
24 * 24 *
25 * Merged changes from 2.2.19 into 2.4.3 25 * Merged changes from 2.2.19 into 2.4.3
26 * -- Eric Biederman <ebiederman@lnxi.com>, 22 April Aug 2001 26 * -- Eric Biederman <ebiederman@lnxi.com>, 22 April Aug 2001
27 * 27 *
28 * Multiple Nameservers in /proc/net/pnp 28 * Multiple Nameservers in /proc/net/pnp
29 * -- Josef Siemes <jsiemes@web.de>, Aug 2002 29 * -- Josef Siemes <jsiemes@web.de>, Aug 2002
30 */ 30 */
31 31
32 #include <linux/types.h> 32 #include <linux/types.h>
33 #include <linux/string.h> 33 #include <linux/string.h>
34 #include <linux/kernel.h> 34 #include <linux/kernel.h>
35 #include <linux/jiffies.h> 35 #include <linux/jiffies.h>
36 #include <linux/random.h> 36 #include <linux/random.h>
37 #include <linux/init.h> 37 #include <linux/init.h>
38 #include <linux/utsname.h> 38 #include <linux/utsname.h>
39 #include <linux/in.h> 39 #include <linux/in.h>
40 #include <linux/if.h> 40 #include <linux/if.h>
41 #include <linux/inet.h> 41 #include <linux/inet.h>
42 #include <linux/inetdevice.h> 42 #include <linux/inetdevice.h>
43 #include <linux/netdevice.h> 43 #include <linux/netdevice.h>
44 #include <linux/if_arp.h> 44 #include <linux/if_arp.h>
45 #include <linux/skbuff.h> 45 #include <linux/skbuff.h>
46 #include <linux/ip.h> 46 #include <linux/ip.h>
47 #include <linux/socket.h> 47 #include <linux/socket.h>
48 #include <linux/route.h> 48 #include <linux/route.h>
49 #include <linux/udp.h> 49 #include <linux/udp.h>
50 #include <linux/proc_fs.h> 50 #include <linux/proc_fs.h>
51 #include <linux/seq_file.h> 51 #include <linux/seq_file.h>
52 #include <linux/major.h> 52 #include <linux/major.h>
53 #include <linux/root_dev.h> 53 #include <linux/root_dev.h>
54 #include <linux/delay.h> 54 #include <linux/delay.h>
55 #include <linux/nfs_fs.h> 55 #include <linux/nfs_fs.h>
56 #include <linux/slab.h> 56 #include <linux/slab.h>
57 #include <linux/export.h> 57 #include <linux/export.h>
58 #include <net/net_namespace.h> 58 #include <net/net_namespace.h>
59 #include <net/arp.h> 59 #include <net/arp.h>
60 #include <net/ip.h> 60 #include <net/ip.h>
61 #include <net/ipconfig.h> 61 #include <net/ipconfig.h>
62 #include <net/route.h> 62 #include <net/route.h>
63 63
64 #include <asm/uaccess.h> 64 #include <asm/uaccess.h>
65 #include <net/checksum.h> 65 #include <net/checksum.h>
66 #include <asm/processor.h> 66 #include <asm/processor.h>
67 67
68 /* Define this to allow debugging output */ 68 /* Define this to allow debugging output */
69 #undef IPCONFIG_DEBUG 69 #undef IPCONFIG_DEBUG
70 70
71 #ifdef IPCONFIG_DEBUG 71 #ifdef IPCONFIG_DEBUG
72 #define DBG(x) printk x 72 #define DBG(x) printk x
73 #else 73 #else
74 #define DBG(x) do { } while(0) 74 #define DBG(x) do { } while(0)
75 #endif 75 #endif
76 76
77 #if defined(CONFIG_IP_PNP_DHCP) 77 #if defined(CONFIG_IP_PNP_DHCP)
78 #define IPCONFIG_DHCP 78 #define IPCONFIG_DHCP
79 #endif 79 #endif
80 #if defined(CONFIG_IP_PNP_BOOTP) || defined(CONFIG_IP_PNP_DHCP) 80 #if defined(CONFIG_IP_PNP_BOOTP) || defined(CONFIG_IP_PNP_DHCP)
81 #define IPCONFIG_BOOTP 81 #define IPCONFIG_BOOTP
82 #endif 82 #endif
83 #if defined(CONFIG_IP_PNP_RARP) 83 #if defined(CONFIG_IP_PNP_RARP)
84 #define IPCONFIG_RARP 84 #define IPCONFIG_RARP
85 #endif 85 #endif
86 #if defined(IPCONFIG_BOOTP) || defined(IPCONFIG_RARP) 86 #if defined(IPCONFIG_BOOTP) || defined(IPCONFIG_RARP)
87 #define IPCONFIG_DYNAMIC 87 #define IPCONFIG_DYNAMIC
88 #endif 88 #endif
89 89
90 /* Define the friendly delay before and after opening net devices */ 90 /* Define the friendly delay before and after opening net devices */
91 #define CONF_POST_OPEN 10 /* After opening: 10 msecs */ 91 #define CONF_POST_OPEN 10 /* After opening: 10 msecs */
92 #define CONF_CARRIER_TIMEOUT 120000 /* Wait for carrier timeout */ 92 #define CONF_CARRIER_TIMEOUT 120000 /* Wait for carrier timeout */
93 93
94 /* Define the timeout for waiting for a DHCP/BOOTP/RARP reply */ 94 /* Define the timeout for waiting for a DHCP/BOOTP/RARP reply */
95 #define CONF_OPEN_RETRIES 2 /* (Re)open devices twice */ 95 #define CONF_OPEN_RETRIES 2 /* (Re)open devices twice */
96 #define CONF_SEND_RETRIES 6 /* Send six requests per open */ 96 #define CONF_SEND_RETRIES 6 /* Send six requests per open */
97 #define CONF_INTER_TIMEOUT (HZ/2) /* Inter-device timeout: 1/2 second */ 97 #define CONF_INTER_TIMEOUT (HZ/2) /* Inter-device timeout: 1/2 second */
98 #define CONF_BASE_TIMEOUT (HZ*2) /* Initial timeout: 2 seconds */ 98 #define CONF_BASE_TIMEOUT (HZ*2) /* Initial timeout: 2 seconds */
99 #define CONF_TIMEOUT_RANDOM (HZ) /* Maximum amount of randomization */ 99 #define CONF_TIMEOUT_RANDOM (HZ) /* Maximum amount of randomization */
100 #define CONF_TIMEOUT_MULT *7/4 /* Rate of timeout growth */ 100 #define CONF_TIMEOUT_MULT *7/4 /* Rate of timeout growth */
101 #define CONF_TIMEOUT_MAX (HZ*30) /* Maximum allowed timeout */ 101 #define CONF_TIMEOUT_MAX (HZ*30) /* Maximum allowed timeout */
102 #define CONF_NAMESERVERS_MAX 3 /* Maximum number of nameservers 102 #define CONF_NAMESERVERS_MAX 3 /* Maximum number of nameservers
103 - '3' from resolv.h */ 103 - '3' from resolv.h */
104 104
105 #define NONE cpu_to_be32(INADDR_NONE) 105 #define NONE cpu_to_be32(INADDR_NONE)
106 #define ANY cpu_to_be32(INADDR_ANY) 106 #define ANY cpu_to_be32(INADDR_ANY)
107 107
108 /* 108 /*
109 * Public IP configuration 109 * Public IP configuration
110 */ 110 */
111 111
112 /* This is used by platforms which might be able to set the ipconfig 112 /* This is used by platforms which might be able to set the ipconfig
113 * variables using firmware environment vars. If this is set, it will 113 * variables using firmware environment vars. If this is set, it will
114 * ignore such firmware variables. 114 * ignore such firmware variables.
115 */ 115 */
116 int ic_set_manually __initdata = 0; /* IPconfig parameters set manually */ 116 int ic_set_manually __initdata = 0; /* IPconfig parameters set manually */
117 117
118 static int ic_enable __initdata = 0; /* IP config enabled? */ 118 static int ic_enable __initdata = 0; /* IP config enabled? */
119 119
120 /* Protocol choice */ 120 /* Protocol choice */
121 int ic_proto_enabled __initdata = 0 121 int ic_proto_enabled __initdata = 0
122 #ifdef IPCONFIG_BOOTP 122 #ifdef IPCONFIG_BOOTP
123 | IC_BOOTP 123 | IC_BOOTP
124 #endif 124 #endif
125 #ifdef CONFIG_IP_PNP_DHCP 125 #ifdef CONFIG_IP_PNP_DHCP
126 | IC_USE_DHCP 126 | IC_USE_DHCP
127 #endif 127 #endif
128 #ifdef IPCONFIG_RARP 128 #ifdef IPCONFIG_RARP
129 | IC_RARP 129 | IC_RARP
130 #endif 130 #endif
131 ; 131 ;
132 132
133 static int ic_host_name_set __initdata = 0; /* Host name set by us? */ 133 static int ic_host_name_set __initdata = 0; /* Host name set by us? */
134 134
135 __be32 ic_myaddr = NONE; /* My IP address */ 135 __be32 ic_myaddr = NONE; /* My IP address */
136 static __be32 ic_netmask = NONE; /* Netmask for local subnet */ 136 static __be32 ic_netmask = NONE; /* Netmask for local subnet */
137 __be32 ic_gateway = NONE; /* Gateway IP address */ 137 __be32 ic_gateway = NONE; /* Gateway IP address */
138 138
139 __be32 ic_servaddr = NONE; /* Boot server IP address */ 139 __be32 ic_servaddr = NONE; /* Boot server IP address */
140 140
141 __be32 root_server_addr = NONE; /* Address of NFS server */ 141 __be32 root_server_addr = NONE; /* Address of NFS server */
142 u8 root_server_path[256] = { 0, }; /* Path to mount as root */ 142 u8 root_server_path[256] = { 0, }; /* Path to mount as root */
143 143
144 __be32 ic_dev_xid; /* Device under configuration */ 144 __be32 ic_dev_xid; /* Device under configuration */
145 145
146 /* vendor class identifier */ 146 /* vendor class identifier */
147 static char vendor_class_identifier[253] __initdata; 147 static char vendor_class_identifier[253] __initdata;
148 148
149 /* Persistent data: */ 149 /* Persistent data: */
150 150
151 static int ic_proto_used; /* Protocol used, if any */ 151 static int ic_proto_used; /* Protocol used, if any */
152 static __be32 ic_nameservers[CONF_NAMESERVERS_MAX]; /* DNS Server IP addresses */ 152 static __be32 ic_nameservers[CONF_NAMESERVERS_MAX]; /* DNS Server IP addresses */
153 static u8 ic_domain[64]; /* DNS (not NIS) domain name */ 153 static u8 ic_domain[64]; /* DNS (not NIS) domain name */
154 154
155 /* 155 /*
156 * Private state. 156 * Private state.
157 */ 157 */
158 158
159 /* Name of user-selected boot device */ 159 /* Name of user-selected boot device */
160 static char user_dev_name[IFNAMSIZ] __initdata = { 0, }; 160 static char user_dev_name[IFNAMSIZ] __initdata = { 0, };
161 161
162 /* Protocols supported by available interfaces */ 162 /* Protocols supported by available interfaces */
163 static int ic_proto_have_if __initdata = 0; 163 static int ic_proto_have_if __initdata = 0;
164 164
165 /* MTU for boot device */ 165 /* MTU for boot device */
166 static int ic_dev_mtu __initdata = 0; 166 static int ic_dev_mtu __initdata = 0;
167 167
168 #ifdef IPCONFIG_DYNAMIC 168 #ifdef IPCONFIG_DYNAMIC
169 static DEFINE_SPINLOCK(ic_recv_lock); 169 static DEFINE_SPINLOCK(ic_recv_lock);
170 static volatile int ic_got_reply __initdata = 0; /* Proto(s) that replied */ 170 static volatile int ic_got_reply __initdata = 0; /* Proto(s) that replied */
171 #endif 171 #endif
172 #ifdef IPCONFIG_DHCP 172 #ifdef IPCONFIG_DHCP
173 static int ic_dhcp_msgtype __initdata = 0; /* DHCP msg type received */ 173 static int ic_dhcp_msgtype __initdata = 0; /* DHCP msg type received */
174 #endif 174 #endif
175 175
176 176
177 /* 177 /*
178 * Network devices 178 * Network devices
179 */ 179 */
180 180
181 struct ic_device { 181 struct ic_device {
182 struct ic_device *next; 182 struct ic_device *next;
183 struct net_device *dev; 183 struct net_device *dev;
184 unsigned short flags; 184 unsigned short flags;
185 short able; 185 short able;
186 __be32 xid; 186 __be32 xid;
187 }; 187 };
188 188
189 static struct ic_device *ic_first_dev __initdata = NULL;/* List of open device */ 189 static struct ic_device *ic_first_dev __initdata = NULL;/* List of open device */
190 static struct net_device *ic_dev __initdata = NULL; /* Selected device */ 190 static struct net_device *ic_dev __initdata = NULL; /* Selected device */
191 191
192 static bool __init ic_is_init_dev(struct net_device *dev) 192 static bool __init ic_is_init_dev(struct net_device *dev)
193 { 193 {
194 if (dev->flags & IFF_LOOPBACK) 194 if (dev->flags & IFF_LOOPBACK)
195 return false; 195 return false;
196 return user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : 196 return user_dev_name[0] ? !strcmp(dev->name, user_dev_name) :
197 (!(dev->flags & IFF_LOOPBACK) && 197 (!(dev->flags & IFF_LOOPBACK) &&
198 (dev->flags & (IFF_POINTOPOINT|IFF_BROADCAST)) && 198 (dev->flags & (IFF_POINTOPOINT|IFF_BROADCAST)) &&
199 strncmp(dev->name, "dummy", 5)); 199 strncmp(dev->name, "dummy", 5));
200 } 200 }
201 201
202 static int __init ic_open_devs(void) 202 static int __init ic_open_devs(void)
203 { 203 {
204 struct ic_device *d, **last; 204 struct ic_device *d, **last;
205 struct net_device *dev; 205 struct net_device *dev;
206 unsigned short oflags; 206 unsigned short oflags;
207 unsigned long start; 207 unsigned long start;
208 208
209 last = &ic_first_dev; 209 last = &ic_first_dev;
210 rtnl_lock(); 210 rtnl_lock();
211 211
212 /* bring loopback device up first */ 212 /* bring loopback device up first */
213 for_each_netdev(&init_net, dev) { 213 for_each_netdev(&init_net, dev) {
214 if (!(dev->flags & IFF_LOOPBACK)) 214 if (!(dev->flags & IFF_LOOPBACK))
215 continue; 215 continue;
216 if (dev_change_flags(dev, dev->flags | IFF_UP) < 0) 216 if (dev_change_flags(dev, dev->flags | IFF_UP) < 0)
217 pr_err("IP-Config: Failed to open %s\n", dev->name); 217 pr_err("IP-Config: Failed to open %s\n", dev->name);
218 } 218 }
219 219
220 for_each_netdev(&init_net, dev) { 220 for_each_netdev(&init_net, dev) {
221 if (ic_is_init_dev(dev)) { 221 if (ic_is_init_dev(dev)) {
222 int able = 0; 222 int able = 0;
223 if (dev->mtu >= 364) 223 if (dev->mtu >= 364)
224 able |= IC_BOOTP; 224 able |= IC_BOOTP;
225 else 225 else
226 pr_warn("DHCP/BOOTP: Ignoring device %s, MTU %d too small", 226 pr_warn("DHCP/BOOTP: Ignoring device %s, MTU %d too small",
227 dev->name, dev->mtu); 227 dev->name, dev->mtu);
228 if (!(dev->flags & IFF_NOARP)) 228 if (!(dev->flags & IFF_NOARP))
229 able |= IC_RARP; 229 able |= IC_RARP;
230 able &= ic_proto_enabled; 230 able &= ic_proto_enabled;
231 if (ic_proto_enabled && !able) 231 if (ic_proto_enabled && !able)
232 continue; 232 continue;
233 oflags = dev->flags; 233 oflags = dev->flags;
234 if (dev_change_flags(dev, oflags | IFF_UP) < 0) { 234 if (dev_change_flags(dev, oflags | IFF_UP) < 0) {
235 pr_err("IP-Config: Failed to open %s\n", 235 pr_err("IP-Config: Failed to open %s\n",
236 dev->name); 236 dev->name);
237 continue; 237 continue;
238 } 238 }
239 if (!(d = kmalloc(sizeof(struct ic_device), GFP_KERNEL))) { 239 if (!(d = kmalloc(sizeof(struct ic_device), GFP_KERNEL))) {
240 rtnl_unlock(); 240 rtnl_unlock();
241 return -ENOMEM; 241 return -ENOMEM;
242 } 242 }
243 d->dev = dev; 243 d->dev = dev;
244 *last = d; 244 *last = d;
245 last = &d->next; 245 last = &d->next;
246 d->flags = oflags; 246 d->flags = oflags;
247 d->able = able; 247 d->able = able;
248 if (able & IC_BOOTP) 248 if (able & IC_BOOTP)
249 get_random_bytes(&d->xid, sizeof(__be32)); 249 get_random_bytes(&d->xid, sizeof(__be32));
250 else 250 else
251 d->xid = 0; 251 d->xid = 0;
252 ic_proto_have_if |= able; 252 ic_proto_have_if |= able;
253 DBG(("IP-Config: %s UP (able=%d, xid=%08x)\n", 253 DBG(("IP-Config: %s UP (able=%d, xid=%08x)\n",
254 dev->name, able, d->xid)); 254 dev->name, able, d->xid));
255 } 255 }
256 } 256 }
257 257
258 /* no point in waiting if we could not bring up at least one device */ 258 /* no point in waiting if we could not bring up at least one device */
259 if (!ic_first_dev) 259 if (!ic_first_dev)
260 goto have_carrier; 260 goto have_carrier;
261 261
262 /* wait for a carrier on at least one device */ 262 /* wait for a carrier on at least one device */
263 start = jiffies; 263 start = jiffies;
264 while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) { 264 while (jiffies - start < msecs_to_jiffies(CONF_CARRIER_TIMEOUT)) {
265 for_each_netdev(&init_net, dev) 265 for_each_netdev(&init_net, dev)
266 if (ic_is_init_dev(dev) && netif_carrier_ok(dev)) 266 if (ic_is_init_dev(dev) && netif_carrier_ok(dev))
267 goto have_carrier; 267 goto have_carrier;
268 268
269 msleep(1); 269 msleep(1);
270 } 270 }
271 have_carrier: 271 have_carrier:
272 rtnl_unlock(); 272 rtnl_unlock();
273 273
274 *last = NULL; 274 *last = NULL;
275 275
276 if (!ic_first_dev) { 276 if (!ic_first_dev) {
277 if (user_dev_name[0]) 277 if (user_dev_name[0])
278 pr_err("IP-Config: Device `%s' not found\n", 278 pr_err("IP-Config: Device `%s' not found\n",
279 user_dev_name); 279 user_dev_name);
280 else 280 else
281 pr_err("IP-Config: No network devices available\n"); 281 pr_err("IP-Config: No network devices available\n");
282 return -ENODEV; 282 return -ENODEV;
283 } 283 }
284 return 0; 284 return 0;
285 } 285 }
286 286
287 static void __init ic_close_devs(void) 287 static void __init ic_close_devs(void)
288 { 288 {
289 struct ic_device *d, *next; 289 struct ic_device *d, *next;
290 struct net_device *dev; 290 struct net_device *dev;
291 291
292 rtnl_lock(); 292 rtnl_lock();
293 next = ic_first_dev; 293 next = ic_first_dev;
294 while ((d = next)) { 294 while ((d = next)) {
295 next = d->next; 295 next = d->next;
296 dev = d->dev; 296 dev = d->dev;
297 if (dev != ic_dev) { 297 if (dev != ic_dev) {
298 DBG(("IP-Config: Downing %s\n", dev->name)); 298 DBG(("IP-Config: Downing %s\n", dev->name));
299 dev_change_flags(dev, d->flags); 299 dev_change_flags(dev, d->flags);
300 } 300 }
301 kfree(d); 301 kfree(d);
302 } 302 }
303 rtnl_unlock(); 303 rtnl_unlock();
304 } 304 }
305 305
306 /* 306 /*
307 * Interface to various network functions. 307 * Interface to various network functions.
308 */ 308 */
309 309
310 static inline void 310 static inline void
311 set_sockaddr(struct sockaddr_in *sin, __be32 addr, __be16 port) 311 set_sockaddr(struct sockaddr_in *sin, __be32 addr, __be16 port)
312 { 312 {
313 sin->sin_family = AF_INET; 313 sin->sin_family = AF_INET;
314 sin->sin_addr.s_addr = addr; 314 sin->sin_addr.s_addr = addr;
315 sin->sin_port = port; 315 sin->sin_port = port;
316 } 316 }
317 317
318 static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg) 318 static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
319 { 319 {
320 int res; 320 int res;
321 321
322 mm_segment_t oldfs = get_fs(); 322 mm_segment_t oldfs = get_fs();
323 set_fs(get_ds()); 323 set_fs(get_ds());
324 res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg); 324 res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
325 set_fs(oldfs); 325 set_fs(oldfs);
326 return res; 326 return res;
327 } 327 }
328 328
329 static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg) 329 static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
330 { 330 {
331 int res; 331 int res;
332 332
333 mm_segment_t oldfs = get_fs(); 333 mm_segment_t oldfs = get_fs();
334 set_fs(get_ds()); 334 set_fs(get_ds());
335 res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg); 335 res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
336 set_fs(oldfs); 336 set_fs(oldfs);
337 return res; 337 return res;
338 } 338 }
339 339
340 static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg) 340 static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
341 { 341 {
342 int res; 342 int res;
343 343
344 mm_segment_t oldfs = get_fs(); 344 mm_segment_t oldfs = get_fs();
345 set_fs(get_ds()); 345 set_fs(get_ds());
346 res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg); 346 res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
347 set_fs(oldfs); 347 set_fs(oldfs);
348 return res; 348 return res;
349 } 349 }
350 350
351 /* 351 /*
352 * Set up interface addresses and routes. 352 * Set up interface addresses and routes.
353 */ 353 */
354 354
355 static int __init ic_setup_if(void) 355 static int __init ic_setup_if(void)
356 { 356 {
357 struct ifreq ir; 357 struct ifreq ir;
358 struct sockaddr_in *sin = (void *) &ir.ifr_ifru.ifru_addr; 358 struct sockaddr_in *sin = (void *) &ir.ifr_ifru.ifru_addr;
359 int err; 359 int err;
360 360
361 memset(&ir, 0, sizeof(ir)); 361 memset(&ir, 0, sizeof(ir));
362 strcpy(ir.ifr_ifrn.ifrn_name, ic_dev->name); 362 strcpy(ir.ifr_ifrn.ifrn_name, ic_dev->name);
363 set_sockaddr(sin, ic_myaddr, 0); 363 set_sockaddr(sin, ic_myaddr, 0);
364 if ((err = ic_devinet_ioctl(SIOCSIFADDR, &ir)) < 0) { 364 if ((err = ic_devinet_ioctl(SIOCSIFADDR, &ir)) < 0) {
365 pr_err("IP-Config: Unable to set interface address (%d)\n", 365 pr_err("IP-Config: Unable to set interface address (%d)\n",
366 err); 366 err);
367 return -1; 367 return -1;
368 } 368 }
369 set_sockaddr(sin, ic_netmask, 0); 369 set_sockaddr(sin, ic_netmask, 0);
370 if ((err = ic_devinet_ioctl(SIOCSIFNETMASK, &ir)) < 0) { 370 if ((err = ic_devinet_ioctl(SIOCSIFNETMASK, &ir)) < 0) {
371 pr_err("IP-Config: Unable to set interface netmask (%d)\n", 371 pr_err("IP-Config: Unable to set interface netmask (%d)\n",
372 err); 372 err);
373 return -1; 373 return -1;
374 } 374 }
375 set_sockaddr(sin, ic_myaddr | ~ic_netmask, 0); 375 set_sockaddr(sin, ic_myaddr | ~ic_netmask, 0);
376 if ((err = ic_devinet_ioctl(SIOCSIFBRDADDR, &ir)) < 0) { 376 if ((err = ic_devinet_ioctl(SIOCSIFBRDADDR, &ir)) < 0) {
377 pr_err("IP-Config: Unable to set interface broadcast address (%d)\n", 377 pr_err("IP-Config: Unable to set interface broadcast address (%d)\n",
378 err); 378 err);
379 return -1; 379 return -1;
380 } 380 }
381 /* Handle the case where we need non-standard MTU on the boot link (a network 381 /* Handle the case where we need non-standard MTU on the boot link (a network
382 * using jumbo frames, for instance). If we can't set the mtu, don't error 382 * using jumbo frames, for instance). If we can't set the mtu, don't error
383 * out, we'll try to muddle along. 383 * out, we'll try to muddle along.
384 */ 384 */
385 if (ic_dev_mtu != 0) { 385 if (ic_dev_mtu != 0) {
386 strcpy(ir.ifr_name, ic_dev->name); 386 strcpy(ir.ifr_name, ic_dev->name);
387 ir.ifr_mtu = ic_dev_mtu; 387 ir.ifr_mtu = ic_dev_mtu;
388 if ((err = ic_dev_ioctl(SIOCSIFMTU, &ir)) < 0) 388 if ((err = ic_dev_ioctl(SIOCSIFMTU, &ir)) < 0)
389 pr_err("IP-Config: Unable to set interface mtu to %d (%d)\n", 389 pr_err("IP-Config: Unable to set interface mtu to %d (%d)\n",
390 ic_dev_mtu, err); 390 ic_dev_mtu, err);
391 } 391 }
392 return 0; 392 return 0;
393 } 393 }
394 394
395 static int __init ic_setup_routes(void) 395 static int __init ic_setup_routes(void)
396 { 396 {
397 /* No need to setup device routes, only the default route... */ 397 /* No need to setup device routes, only the default route... */
398 398
399 if (ic_gateway != NONE) { 399 if (ic_gateway != NONE) {
400 struct rtentry rm; 400 struct rtentry rm;
401 int err; 401 int err;
402 402
403 memset(&rm, 0, sizeof(rm)); 403 memset(&rm, 0, sizeof(rm));
404 if ((ic_gateway ^ ic_myaddr) & ic_netmask) { 404 if ((ic_gateway ^ ic_myaddr) & ic_netmask) {
405 pr_err("IP-Config: Gateway not on directly connected network\n"); 405 pr_err("IP-Config: Gateway not on directly connected network\n");
406 return -1; 406 return -1;
407 } 407 }
408 set_sockaddr((struct sockaddr_in *) &rm.rt_dst, 0, 0); 408 set_sockaddr((struct sockaddr_in *) &rm.rt_dst, 0, 0);
409 set_sockaddr((struct sockaddr_in *) &rm.rt_genmask, 0, 0); 409 set_sockaddr((struct sockaddr_in *) &rm.rt_genmask, 0, 0);
410 set_sockaddr((struct sockaddr_in *) &rm.rt_gateway, ic_gateway, 0); 410 set_sockaddr((struct sockaddr_in *) &rm.rt_gateway, ic_gateway, 0);
411 rm.rt_flags = RTF_UP | RTF_GATEWAY; 411 rm.rt_flags = RTF_UP | RTF_GATEWAY;
412 if ((err = ic_route_ioctl(SIOCADDRT, &rm)) < 0) { 412 if ((err = ic_route_ioctl(SIOCADDRT, &rm)) < 0) {
413 pr_err("IP-Config: Cannot add default route (%d)\n", 413 pr_err("IP-Config: Cannot add default route (%d)\n",
414 err); 414 err);
415 return -1; 415 return -1;
416 } 416 }
417 } 417 }
418 418
419 return 0; 419 return 0;
420 } 420 }
421 421
422 /* 422 /*
423 * Fill in default values for all missing parameters. 423 * Fill in default values for all missing parameters.
424 */ 424 */
425 425
426 static int __init ic_defaults(void) 426 static int __init ic_defaults(void)
427 { 427 {
428 /* 428 /*
429 * At this point we have no userspace running so need not 429 * At this point we have no userspace running so need not
430 * claim locks on system_utsname 430 * claim locks on system_utsname
431 */ 431 */
432 432
433 if (!ic_host_name_set) 433 if (!ic_host_name_set)
434 sprintf(init_utsname()->nodename, "%pI4", &ic_myaddr); 434 sprintf(init_utsname()->nodename, "%pI4", &ic_myaddr);
435 435
436 if (root_server_addr == NONE) 436 if (root_server_addr == NONE)
437 root_server_addr = ic_servaddr; 437 root_server_addr = ic_servaddr;
438 438
439 if (ic_netmask == NONE) { 439 if (ic_netmask == NONE) {
440 if (IN_CLASSA(ntohl(ic_myaddr))) 440 if (IN_CLASSA(ntohl(ic_myaddr)))
441 ic_netmask = htonl(IN_CLASSA_NET); 441 ic_netmask = htonl(IN_CLASSA_NET);
442 else if (IN_CLASSB(ntohl(ic_myaddr))) 442 else if (IN_CLASSB(ntohl(ic_myaddr)))
443 ic_netmask = htonl(IN_CLASSB_NET); 443 ic_netmask = htonl(IN_CLASSB_NET);
444 else if (IN_CLASSC(ntohl(ic_myaddr))) 444 else if (IN_CLASSC(ntohl(ic_myaddr)))
445 ic_netmask = htonl(IN_CLASSC_NET); 445 ic_netmask = htonl(IN_CLASSC_NET);
446 else { 446 else {
447 pr_err("IP-Config: Unable to guess netmask for address %pI4\n", 447 pr_err("IP-Config: Unable to guess netmask for address %pI4\n",
448 &ic_myaddr); 448 &ic_myaddr);
449 return -1; 449 return -1;
450 } 450 }
451 printk("IP-Config: Guessing netmask %pI4\n", &ic_netmask); 451 printk("IP-Config: Guessing netmask %pI4\n", &ic_netmask);
452 } 452 }
453 453
454 return 0; 454 return 0;
455 } 455 }
456 456
457 /* 457 /*
458 * RARP support. 458 * RARP support.
459 */ 459 */
460 460
461 #ifdef IPCONFIG_RARP 461 #ifdef IPCONFIG_RARP
462 462
463 static int ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev); 463 static int ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev);
464 464
465 static struct packet_type rarp_packet_type __initdata = { 465 static struct packet_type rarp_packet_type __initdata = {
466 .type = cpu_to_be16(ETH_P_RARP), 466 .type = cpu_to_be16(ETH_P_RARP),
467 .func = ic_rarp_recv, 467 .func = ic_rarp_recv,
468 }; 468 };
469 469
470 static inline void __init ic_rarp_init(void) 470 static inline void __init ic_rarp_init(void)
471 { 471 {
472 dev_add_pack(&rarp_packet_type); 472 dev_add_pack(&rarp_packet_type);
473 } 473 }
474 474
475 static inline void __init ic_rarp_cleanup(void) 475 static inline void __init ic_rarp_cleanup(void)
476 { 476 {
477 dev_remove_pack(&rarp_packet_type); 477 dev_remove_pack(&rarp_packet_type);
478 } 478 }
479 479
480 /* 480 /*
481 * Process received RARP packet. 481 * Process received RARP packet.
482 */ 482 */
483 static int __init 483 static int __init
484 ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) 484 ic_rarp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
485 { 485 {
486 struct arphdr *rarp; 486 struct arphdr *rarp;
487 unsigned char *rarp_ptr; 487 unsigned char *rarp_ptr;
488 __be32 sip, tip; 488 __be32 sip, tip;
489 unsigned char *sha, *tha; /* s for "source", t for "target" */ 489 unsigned char *sha, *tha; /* s for "source", t for "target" */
490 struct ic_device *d; 490 struct ic_device *d;
491 491
492 if (!net_eq(dev_net(dev), &init_net)) 492 if (!net_eq(dev_net(dev), &init_net))
493 goto drop; 493 goto drop;
494 494
495 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) 495 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
496 return NET_RX_DROP; 496 return NET_RX_DROP;
497 497
498 if (!pskb_may_pull(skb, sizeof(struct arphdr))) 498 if (!pskb_may_pull(skb, sizeof(struct arphdr)))
499 goto drop; 499 goto drop;
500 500
501 /* Basic sanity checks can be done without the lock. */ 501 /* Basic sanity checks can be done without the lock. */
502 rarp = (struct arphdr *)skb_transport_header(skb); 502 rarp = (struct arphdr *)skb_transport_header(skb);
503 503
504 /* If this test doesn't pass, it's not IP, or we should 504 /* If this test doesn't pass, it's not IP, or we should
505 * ignore it anyway. 505 * ignore it anyway.
506 */ 506 */
507 if (rarp->ar_hln != dev->addr_len || dev->type != ntohs(rarp->ar_hrd)) 507 if (rarp->ar_hln != dev->addr_len || dev->type != ntohs(rarp->ar_hrd))
508 goto drop; 508 goto drop;
509 509
510 /* If it's not a RARP reply, delete it. */ 510 /* If it's not a RARP reply, delete it. */
511 if (rarp->ar_op != htons(ARPOP_RREPLY)) 511 if (rarp->ar_op != htons(ARPOP_RREPLY))
512 goto drop; 512 goto drop;
513 513
514 /* If it's not Ethernet, delete it. */ 514 /* If it's not Ethernet, delete it. */
515 if (rarp->ar_pro != htons(ETH_P_IP)) 515 if (rarp->ar_pro != htons(ETH_P_IP))
516 goto drop; 516 goto drop;
517 517
518 if (!pskb_may_pull(skb, arp_hdr_len(dev))) 518 if (!pskb_may_pull(skb, arp_hdr_len(dev)))
519 goto drop; 519 goto drop;
520 520
521 /* OK, it is all there and looks valid, process... */ 521 /* OK, it is all there and looks valid, process... */
522 rarp = (struct arphdr *)skb_transport_header(skb); 522 rarp = (struct arphdr *)skb_transport_header(skb);
523 rarp_ptr = (unsigned char *) (rarp + 1); 523 rarp_ptr = (unsigned char *) (rarp + 1);
524 524
525 /* One reply at a time, please. */ 525 /* One reply at a time, please. */
526 spin_lock(&ic_recv_lock); 526 spin_lock(&ic_recv_lock);
527 527
528 /* If we already have a reply, just drop the packet */ 528 /* If we already have a reply, just drop the packet */
529 if (ic_got_reply) 529 if (ic_got_reply)
530 goto drop_unlock; 530 goto drop_unlock;
531 531
532 /* Find the ic_device that the packet arrived on */ 532 /* Find the ic_device that the packet arrived on */
533 d = ic_first_dev; 533 d = ic_first_dev;
534 while (d && d->dev != dev) 534 while (d && d->dev != dev)
535 d = d->next; 535 d = d->next;
536 if (!d) 536 if (!d)
537 goto drop_unlock; /* should never happen */ 537 goto drop_unlock; /* should never happen */
538 538
539 /* Extract variable-width fields */ 539 /* Extract variable-width fields */
540 sha = rarp_ptr; 540 sha = rarp_ptr;
541 rarp_ptr += dev->addr_len; 541 rarp_ptr += dev->addr_len;
542 memcpy(&sip, rarp_ptr, 4); 542 memcpy(&sip, rarp_ptr, 4);
543 rarp_ptr += 4; 543 rarp_ptr += 4;
544 tha = rarp_ptr; 544 tha = rarp_ptr;
545 rarp_ptr += dev->addr_len; 545 rarp_ptr += dev->addr_len;
546 memcpy(&tip, rarp_ptr, 4); 546 memcpy(&tip, rarp_ptr, 4);
547 547
548 /* Discard packets which are not meant for us. */ 548 /* Discard packets which are not meant for us. */
549 if (memcmp(tha, dev->dev_addr, dev->addr_len)) 549 if (memcmp(tha, dev->dev_addr, dev->addr_len))
550 goto drop_unlock; 550 goto drop_unlock;
551 551
552 /* Discard packets which are not from specified server. */ 552 /* Discard packets which are not from specified server. */
553 if (ic_servaddr != NONE && ic_servaddr != sip) 553 if (ic_servaddr != NONE && ic_servaddr != sip)
554 goto drop_unlock; 554 goto drop_unlock;
555 555
556 /* We have a winner! */ 556 /* We have a winner! */
557 ic_dev = dev; 557 ic_dev = dev;
558 if (ic_myaddr == NONE) 558 if (ic_myaddr == NONE)
559 ic_myaddr = tip; 559 ic_myaddr = tip;
560 ic_servaddr = sip; 560 ic_servaddr = sip;
561 ic_got_reply = IC_RARP; 561 ic_got_reply = IC_RARP;
562 562
563 drop_unlock: 563 drop_unlock:
564 /* Show's over. Nothing to see here. */ 564 /* Show's over. Nothing to see here. */
565 spin_unlock(&ic_recv_lock); 565 spin_unlock(&ic_recv_lock);
566 566
567 drop: 567 drop:
568 /* Throw the packet out. */ 568 /* Throw the packet out. */
569 kfree_skb(skb); 569 kfree_skb(skb);
570 return 0; 570 return 0;
571 } 571 }
572 572
573 573
574 /* 574 /*
575 * Send RARP request packet over a single interface. 575 * Send RARP request packet over a single interface.
576 */ 576 */
577 static void __init ic_rarp_send_if(struct ic_device *d) 577 static void __init ic_rarp_send_if(struct ic_device *d)
578 { 578 {
579 struct net_device *dev = d->dev; 579 struct net_device *dev = d->dev;
580 arp_send(ARPOP_RREQUEST, ETH_P_RARP, 0, dev, 0, NULL, 580 arp_send(ARPOP_RREQUEST, ETH_P_RARP, 0, dev, 0, NULL,
581 dev->dev_addr, dev->dev_addr); 581 dev->dev_addr, dev->dev_addr);
582 } 582 }
583 #endif 583 #endif
584 584
585 /* 585 /*
586 * DHCP/BOOTP support. 586 * DHCP/BOOTP support.
587 */ 587 */
588 588
589 #ifdef IPCONFIG_BOOTP 589 #ifdef IPCONFIG_BOOTP
590 590
591 struct bootp_pkt { /* BOOTP packet format */ 591 struct bootp_pkt { /* BOOTP packet format */
592 struct iphdr iph; /* IP header */ 592 struct iphdr iph; /* IP header */
593 struct udphdr udph; /* UDP header */ 593 struct udphdr udph; /* UDP header */
594 u8 op; /* 1=request, 2=reply */ 594 u8 op; /* 1=request, 2=reply */
595 u8 htype; /* HW address type */ 595 u8 htype; /* HW address type */
596 u8 hlen; /* HW address length */ 596 u8 hlen; /* HW address length */
597 u8 hops; /* Used only by gateways */ 597 u8 hops; /* Used only by gateways */
598 __be32 xid; /* Transaction ID */ 598 __be32 xid; /* Transaction ID */
599 __be16 secs; /* Seconds since we started */ 599 __be16 secs; /* Seconds since we started */
600 __be16 flags; /* Just what it says */ 600 __be16 flags; /* Just what it says */
601 __be32 client_ip; /* Client's IP address if known */ 601 __be32 client_ip; /* Client's IP address if known */
602 __be32 your_ip; /* Assigned IP address */ 602 __be32 your_ip; /* Assigned IP address */
603 __be32 server_ip; /* (Next, e.g. NFS) Server's IP address */ 603 __be32 server_ip; /* (Next, e.g. NFS) Server's IP address */
604 __be32 relay_ip; /* IP address of BOOTP relay */ 604 __be32 relay_ip; /* IP address of BOOTP relay */
605 u8 hw_addr[16]; /* Client's HW address */ 605 u8 hw_addr[16]; /* Client's HW address */
606 u8 serv_name[64]; /* Server host name */ 606 u8 serv_name[64]; /* Server host name */
607 u8 boot_file[128]; /* Name of boot file */ 607 u8 boot_file[128]; /* Name of boot file */
608 u8 exten[312]; /* DHCP options / BOOTP vendor extensions */ 608 u8 exten[312]; /* DHCP options / BOOTP vendor extensions */
609 }; 609 };
610 610
611 /* packet ops */ 611 /* packet ops */
612 #define BOOTP_REQUEST 1 612 #define BOOTP_REQUEST 1
613 #define BOOTP_REPLY 2 613 #define BOOTP_REPLY 2
614 614
615 /* DHCP message types */ 615 /* DHCP message types */
616 #define DHCPDISCOVER 1 616 #define DHCPDISCOVER 1
617 #define DHCPOFFER 2 617 #define DHCPOFFER 2
618 #define DHCPREQUEST 3 618 #define DHCPREQUEST 3
619 #define DHCPDECLINE 4 619 #define DHCPDECLINE 4
620 #define DHCPACK 5 620 #define DHCPACK 5
621 #define DHCPNAK 6 621 #define DHCPNAK 6
622 #define DHCPRELEASE 7 622 #define DHCPRELEASE 7
623 #define DHCPINFORM 8 623 #define DHCPINFORM 8
624 624
625 static int ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev); 625 static int ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev);
626 626
627 static struct packet_type bootp_packet_type __initdata = { 627 static struct packet_type bootp_packet_type __initdata = {
628 .type = cpu_to_be16(ETH_P_IP), 628 .type = cpu_to_be16(ETH_P_IP),
629 .func = ic_bootp_recv, 629 .func = ic_bootp_recv,
630 }; 630 };
631 631
632 632
633 /* 633 /*
634 * Initialize DHCP/BOOTP extension fields in the request. 634 * Initialize DHCP/BOOTP extension fields in the request.
635 */ 635 */
636 636
637 static const u8 ic_bootp_cookie[4] = { 99, 130, 83, 99 }; 637 static const u8 ic_bootp_cookie[4] = { 99, 130, 83, 99 };
638 638
639 #ifdef IPCONFIG_DHCP 639 #ifdef IPCONFIG_DHCP
640 640
641 static void __init 641 static void __init
642 ic_dhcp_init_options(u8 *options) 642 ic_dhcp_init_options(u8 *options)
643 { 643 {
644 u8 mt = ((ic_servaddr == NONE) 644 u8 mt = ((ic_servaddr == NONE)
645 ? DHCPDISCOVER : DHCPREQUEST); 645 ? DHCPDISCOVER : DHCPREQUEST);
646 u8 *e = options; 646 u8 *e = options;
647 int len; 647 int len;
648 648
649 #ifdef IPCONFIG_DEBUG 649 #ifdef IPCONFIG_DEBUG
650 printk("DHCP: Sending message type %d\n", mt); 650 printk("DHCP: Sending message type %d\n", mt);
651 #endif 651 #endif
652 652
653 memcpy(e, ic_bootp_cookie, 4); /* RFC1048 Magic Cookie */ 653 memcpy(e, ic_bootp_cookie, 4); /* RFC1048 Magic Cookie */
654 e += 4; 654 e += 4;
655 655
656 *e++ = 53; /* DHCP message type */ 656 *e++ = 53; /* DHCP message type */
657 *e++ = 1; 657 *e++ = 1;
658 *e++ = mt; 658 *e++ = mt;
659 659
660 if (mt == DHCPREQUEST) { 660 if (mt == DHCPREQUEST) {
661 *e++ = 54; /* Server ID (IP address) */ 661 *e++ = 54; /* Server ID (IP address) */
662 *e++ = 4; 662 *e++ = 4;
663 memcpy(e, &ic_servaddr, 4); 663 memcpy(e, &ic_servaddr, 4);
664 e += 4; 664 e += 4;
665 665
666 *e++ = 50; /* Requested IP address */ 666 *e++ = 50; /* Requested IP address */
667 *e++ = 4; 667 *e++ = 4;
668 memcpy(e, &ic_myaddr, 4); 668 memcpy(e, &ic_myaddr, 4);
669 e += 4; 669 e += 4;
670 } 670 }
671 671
672 /* always? */ 672 /* always? */
673 { 673 {
674 static const u8 ic_req_params[] = { 674 static const u8 ic_req_params[] = {
675 1, /* Subnet mask */ 675 1, /* Subnet mask */
676 3, /* Default gateway */ 676 3, /* Default gateway */
677 6, /* DNS server */ 677 6, /* DNS server */
678 12, /* Host name */ 678 12, /* Host name */
679 15, /* Domain name */ 679 15, /* Domain name */
680 17, /* Boot path */ 680 17, /* Boot path */
681 26, /* MTU */ 681 26, /* MTU */
682 40, /* NIS domain name */ 682 40, /* NIS domain name */
683 }; 683 };
684 684
685 *e++ = 55; /* Parameter request list */ 685 *e++ = 55; /* Parameter request list */
686 *e++ = sizeof(ic_req_params); 686 *e++ = sizeof(ic_req_params);
687 memcpy(e, ic_req_params, sizeof(ic_req_params)); 687 memcpy(e, ic_req_params, sizeof(ic_req_params));
688 e += sizeof(ic_req_params); 688 e += sizeof(ic_req_params);
689 689
690 if (ic_host_name_set) { 690 if (ic_host_name_set) {
691 *e++ = 12; /* host-name */ 691 *e++ = 12; /* host-name */
692 len = strlen(utsname()->nodename); 692 len = strlen(utsname()->nodename);
693 *e++ = len; 693 *e++ = len;
694 memcpy(e, utsname()->nodename, len); 694 memcpy(e, utsname()->nodename, len);
695 e += len; 695 e += len;
696 } 696 }
697 if (*vendor_class_identifier) { 697 if (*vendor_class_identifier) {
698 pr_info("DHCP: sending class identifier \"%s\"\n", 698 pr_info("DHCP: sending class identifier \"%s\"\n",
699 vendor_class_identifier); 699 vendor_class_identifier);
700 *e++ = 60; /* Class-identifier */ 700 *e++ = 60; /* Class-identifier */
701 len = strlen(vendor_class_identifier); 701 len = strlen(vendor_class_identifier);
702 *e++ = len; 702 *e++ = len;
703 memcpy(e, vendor_class_identifier, len); 703 memcpy(e, vendor_class_identifier, len);
704 e += len; 704 e += len;
705 } 705 }
706 } 706 }
707 707
708 *e++ = 255; /* End of the list */ 708 *e++ = 255; /* End of the list */
709 } 709 }
710 710
711 #endif /* IPCONFIG_DHCP */ 711 #endif /* IPCONFIG_DHCP */
712 712
713 static void __init ic_bootp_init_ext(u8 *e) 713 static void __init ic_bootp_init_ext(u8 *e)
714 { 714 {
715 memcpy(e, ic_bootp_cookie, 4); /* RFC1048 Magic Cookie */ 715 memcpy(e, ic_bootp_cookie, 4); /* RFC1048 Magic Cookie */
716 e += 4; 716 e += 4;
717 *e++ = 1; /* Subnet mask request */ 717 *e++ = 1; /* Subnet mask request */
718 *e++ = 4; 718 *e++ = 4;
719 e += 4; 719 e += 4;
720 *e++ = 3; /* Default gateway request */ 720 *e++ = 3; /* Default gateway request */
721 *e++ = 4; 721 *e++ = 4;
722 e += 4; 722 e += 4;
723 *e++ = 5; /* Name server request */ 723 *e++ = 5; /* Name server request */
724 *e++ = 8; 724 *e++ = 8;
725 e += 8; 725 e += 8;
726 *e++ = 12; /* Host name request */ 726 *e++ = 12; /* Host name request */
727 *e++ = 32; 727 *e++ = 32;
728 e += 32; 728 e += 32;
729 *e++ = 40; /* NIS Domain name request */ 729 *e++ = 40; /* NIS Domain name request */
730 *e++ = 32; 730 *e++ = 32;
731 e += 32; 731 e += 32;
732 *e++ = 17; /* Boot path */ 732 *e++ = 17; /* Boot path */
733 *e++ = 40; 733 *e++ = 40;
734 e += 40; 734 e += 40;
735 735
736 *e++ = 57; /* set extension buffer size for reply */ 736 *e++ = 57; /* set extension buffer size for reply */
737 *e++ = 2; 737 *e++ = 2;
738 *e++ = 1; /* 128+236+8+20+14, see dhcpd sources */ 738 *e++ = 1; /* 128+236+8+20+14, see dhcpd sources */
739 *e++ = 150; 739 *e++ = 150;
740 740
741 *e++ = 255; /* End of the list */ 741 *e++ = 255; /* End of the list */
742 } 742 }
743 743
744 744
745 /* 745 /*
746 * Initialize the DHCP/BOOTP mechanism. 746 * Initialize the DHCP/BOOTP mechanism.
747 */ 747 */
748 static inline void __init ic_bootp_init(void) 748 static inline void __init ic_bootp_init(void)
749 { 749 {
750 int i; 750 int i;
751 751
752 for (i = 0; i < CONF_NAMESERVERS_MAX; i++) 752 for (i = 0; i < CONF_NAMESERVERS_MAX; i++)
753 ic_nameservers[i] = NONE; 753 ic_nameservers[i] = NONE;
754 754
755 dev_add_pack(&bootp_packet_type); 755 dev_add_pack(&bootp_packet_type);
756 } 756 }
757 757
758 758
759 /* 759 /*
760 * DHCP/BOOTP cleanup. 760 * DHCP/BOOTP cleanup.
761 */ 761 */
762 static inline void __init ic_bootp_cleanup(void) 762 static inline void __init ic_bootp_cleanup(void)
763 { 763 {
764 dev_remove_pack(&bootp_packet_type); 764 dev_remove_pack(&bootp_packet_type);
765 } 765 }
766 766
767 767
768 /* 768 /*
769 * Send DHCP/BOOTP request to single interface. 769 * Send DHCP/BOOTP request to single interface.
770 */ 770 */
771 static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_diff) 771 static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_diff)
772 { 772 {
773 struct net_device *dev = d->dev; 773 struct net_device *dev = d->dev;
774 struct sk_buff *skb; 774 struct sk_buff *skb;
775 struct bootp_pkt *b; 775 struct bootp_pkt *b;
776 struct iphdr *h; 776 struct iphdr *h;
777 int hlen = LL_RESERVED_SPACE(dev); 777 int hlen = LL_RESERVED_SPACE(dev);
778 int tlen = dev->needed_tailroom; 778 int tlen = dev->needed_tailroom;
779 779
780 /* Allocate packet */ 780 /* Allocate packet */
781 skb = alloc_skb(sizeof(struct bootp_pkt) + hlen + tlen + 15, 781 skb = alloc_skb(sizeof(struct bootp_pkt) + hlen + tlen + 15,
782 GFP_KERNEL); 782 GFP_KERNEL);
783 if (!skb) 783 if (!skb)
784 return; 784 return;
785 skb_reserve(skb, hlen); 785 skb_reserve(skb, hlen);
786 b = (struct bootp_pkt *) skb_put(skb, sizeof(struct bootp_pkt)); 786 b = (struct bootp_pkt *) skb_put(skb, sizeof(struct bootp_pkt));
787 memset(b, 0, sizeof(struct bootp_pkt)); 787 memset(b, 0, sizeof(struct bootp_pkt));
788 788
789 /* Construct IP header */ 789 /* Construct IP header */
790 skb_reset_network_header(skb); 790 skb_reset_network_header(skb);
791 h = ip_hdr(skb); 791 h = ip_hdr(skb);
792 h->version = 4; 792 h->version = 4;
793 h->ihl = 5; 793 h->ihl = 5;
794 h->tot_len = htons(sizeof(struct bootp_pkt)); 794 h->tot_len = htons(sizeof(struct bootp_pkt));
795 h->frag_off = htons(IP_DF); 795 h->frag_off = htons(IP_DF);
796 h->ttl = 64; 796 h->ttl = 64;
797 h->protocol = IPPROTO_UDP; 797 h->protocol = IPPROTO_UDP;
798 h->daddr = htonl(INADDR_BROADCAST); 798 h->daddr = htonl(INADDR_BROADCAST);
799 h->check = ip_fast_csum((unsigned char *) h, h->ihl); 799 h->check = ip_fast_csum((unsigned char *) h, h->ihl);
800 800
801 /* Construct UDP header */ 801 /* Construct UDP header */
802 b->udph.source = htons(68); 802 b->udph.source = htons(68);
803 b->udph.dest = htons(67); 803 b->udph.dest = htons(67);
804 b->udph.len = htons(sizeof(struct bootp_pkt) - sizeof(struct iphdr)); 804 b->udph.len = htons(sizeof(struct bootp_pkt) - sizeof(struct iphdr));
805 /* UDP checksum not calculated -- explicitly allowed in BOOTP RFC */ 805 /* UDP checksum not calculated -- explicitly allowed in BOOTP RFC */
806 806
807 /* Construct DHCP/BOOTP header */ 807 /* Construct DHCP/BOOTP header */
808 b->op = BOOTP_REQUEST; 808 b->op = BOOTP_REQUEST;
809 if (dev->type < 256) /* check for false types */ 809 if (dev->type < 256) /* check for false types */
810 b->htype = dev->type; 810 b->htype = dev->type;
811 else if (dev->type == ARPHRD_FDDI) 811 else if (dev->type == ARPHRD_FDDI)
812 b->htype = ARPHRD_ETHER; 812 b->htype = ARPHRD_ETHER;
813 else { 813 else {
814 printk("Unknown ARP type 0x%04x for device %s\n", dev->type, dev->name); 814 printk("Unknown ARP type 0x%04x for device %s\n", dev->type, dev->name);
815 b->htype = dev->type; /* can cause undefined behavior */ 815 b->htype = dev->type; /* can cause undefined behavior */
816 } 816 }
817 817
818 /* server_ip and your_ip address are both already zero per RFC2131 */ 818 /* server_ip and your_ip address are both already zero per RFC2131 */
819 b->hlen = dev->addr_len; 819 b->hlen = dev->addr_len;
820 memcpy(b->hw_addr, dev->dev_addr, dev->addr_len); 820 memcpy(b->hw_addr, dev->dev_addr, dev->addr_len);
821 b->secs = htons(jiffies_diff / HZ); 821 b->secs = htons(jiffies_diff / HZ);
822 b->xid = d->xid; 822 b->xid = d->xid;
823 823
824 /* add DHCP options or BOOTP extensions */ 824 /* add DHCP options or BOOTP extensions */
825 #ifdef IPCONFIG_DHCP 825 #ifdef IPCONFIG_DHCP
826 if (ic_proto_enabled & IC_USE_DHCP) 826 if (ic_proto_enabled & IC_USE_DHCP)
827 ic_dhcp_init_options(b->exten); 827 ic_dhcp_init_options(b->exten);
828 else 828 else
829 #endif 829 #endif
830 ic_bootp_init_ext(b->exten); 830 ic_bootp_init_ext(b->exten);
831 831
832 /* Chain packet down the line... */ 832 /* Chain packet down the line... */
833 skb->dev = dev; 833 skb->dev = dev;
834 skb->protocol = htons(ETH_P_IP); 834 skb->protocol = htons(ETH_P_IP);
835 if (dev_hard_header(skb, dev, ntohs(skb->protocol), 835 if (dev_hard_header(skb, dev, ntohs(skb->protocol),
836 dev->broadcast, dev->dev_addr, skb->len) < 0) { 836 dev->broadcast, dev->dev_addr, skb->len) < 0) {
837 kfree_skb(skb); 837 kfree_skb(skb);
838 printk("E"); 838 printk("E");
839 return; 839 return;
840 } 840 }
841 841
842 if (dev_queue_xmit(skb) < 0) 842 if (dev_queue_xmit(skb) < 0)
843 printk("E"); 843 printk("E");
844 } 844 }
845 845
846 846
847 /* 847 /*
848 * Copy BOOTP-supplied string if not already set. 848 * Copy BOOTP-supplied string if not already set.
849 */ 849 */
850 static int __init ic_bootp_string(char *dest, char *src, int len, int max) 850 static int __init ic_bootp_string(char *dest, char *src, int len, int max)
851 { 851 {
852 if (!len) 852 if (!len)
853 return 0; 853 return 0;
854 if (len > max-1) 854 if (len > max-1)
855 len = max-1; 855 len = max-1;
856 memcpy(dest, src, len); 856 memcpy(dest, src, len);
857 dest[len] = '\0'; 857 dest[len] = '\0';
858 return 1; 858 return 1;
859 } 859 }
860 860
861 861
862 /* 862 /*
863 * Process BOOTP extensions. 863 * Process BOOTP extensions.
864 */ 864 */
865 static void __init ic_do_bootp_ext(u8 *ext) 865 static void __init ic_do_bootp_ext(u8 *ext)
866 { 866 {
867 u8 servers; 867 u8 servers;
868 int i; 868 int i;
869 __be16 mtu; 869 __be16 mtu;
870 870
871 #ifdef IPCONFIG_DEBUG 871 #ifdef IPCONFIG_DEBUG
872 u8 *c; 872 u8 *c;
873 873
874 printk("DHCP/BOOTP: Got extension %d:",*ext); 874 printk("DHCP/BOOTP: Got extension %d:",*ext);
875 for (c=ext+2; c<ext+2+ext[1]; c++) 875 for (c=ext+2; c<ext+2+ext[1]; c++)
876 printk(" %02x", *c); 876 printk(" %02x", *c);
877 printk("\n"); 877 printk("\n");
878 #endif 878 #endif
879 879
880 switch (*ext++) { 880 switch (*ext++) {
881 case 1: /* Subnet mask */ 881 case 1: /* Subnet mask */
882 if (ic_netmask == NONE) 882 if (ic_netmask == NONE)
883 memcpy(&ic_netmask, ext+1, 4); 883 memcpy(&ic_netmask, ext+1, 4);
884 break; 884 break;
885 case 3: /* Default gateway */ 885 case 3: /* Default gateway */
886 if (ic_gateway == NONE) 886 if (ic_gateway == NONE)
887 memcpy(&ic_gateway, ext+1, 4); 887 memcpy(&ic_gateway, ext+1, 4);
888 break; 888 break;
889 case 6: /* DNS server */ 889 case 6: /* DNS server */
890 servers= *ext/4; 890 servers= *ext/4;
891 if (servers > CONF_NAMESERVERS_MAX) 891 if (servers > CONF_NAMESERVERS_MAX)
892 servers = CONF_NAMESERVERS_MAX; 892 servers = CONF_NAMESERVERS_MAX;
893 for (i = 0; i < servers; i++) { 893 for (i = 0; i < servers; i++) {
894 if (ic_nameservers[i] == NONE) 894 if (ic_nameservers[i] == NONE)
895 memcpy(&ic_nameservers[i], ext+1+4*i, 4); 895 memcpy(&ic_nameservers[i], ext+1+4*i, 4);
896 } 896 }
897 break; 897 break;
898 case 12: /* Host name */ 898 case 12: /* Host name */
899 ic_bootp_string(utsname()->nodename, ext+1, *ext, 899 ic_bootp_string(utsname()->nodename, ext+1, *ext,
900 __NEW_UTS_LEN); 900 __NEW_UTS_LEN);
901 ic_host_name_set = 1; 901 ic_host_name_set = 1;
902 break; 902 break;
903 case 15: /* Domain name (DNS) */ 903 case 15: /* Domain name (DNS) */
904 ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain)); 904 ic_bootp_string(ic_domain, ext+1, *ext, sizeof(ic_domain));
905 break; 905 break;
906 case 17: /* Root path */ 906 case 17: /* Root path */
907 if (!root_server_path[0]) 907 if (!root_server_path[0])
908 ic_bootp_string(root_server_path, ext+1, *ext, 908 ic_bootp_string(root_server_path, ext+1, *ext,
909 sizeof(root_server_path)); 909 sizeof(root_server_path));
910 break; 910 break;
911 case 26: /* Interface MTU */ 911 case 26: /* Interface MTU */
912 memcpy(&mtu, ext+1, sizeof(mtu)); 912 memcpy(&mtu, ext+1, sizeof(mtu));
913 ic_dev_mtu = ntohs(mtu); 913 ic_dev_mtu = ntohs(mtu);
914 break; 914 break;
915 case 40: /* NIS Domain name (_not_ DNS) */ 915 case 40: /* NIS Domain name (_not_ DNS) */
916 ic_bootp_string(utsname()->domainname, ext+1, *ext, 916 ic_bootp_string(utsname()->domainname, ext+1, *ext,
917 __NEW_UTS_LEN); 917 __NEW_UTS_LEN);
918 break; 918 break;
919 } 919 }
920 } 920 }
921 921
922 922
923 /* 923 /*
924 * Receive BOOTP reply. 924 * Receive BOOTP reply.
925 */ 925 */
926 static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) 926 static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
927 { 927 {
928 struct bootp_pkt *b; 928 struct bootp_pkt *b;
929 struct iphdr *h; 929 struct iphdr *h;
930 struct ic_device *d; 930 struct ic_device *d;
931 int len, ext_len; 931 int len, ext_len;
932 932
933 if (!net_eq(dev_net(dev), &init_net)) 933 if (!net_eq(dev_net(dev), &init_net))
934 goto drop; 934 goto drop;
935 935
936 /* Perform verifications before taking the lock. */ 936 /* Perform verifications before taking the lock. */
937 if (skb->pkt_type == PACKET_OTHERHOST) 937 if (skb->pkt_type == PACKET_OTHERHOST)
938 goto drop; 938 goto drop;
939 939
940 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) 940 if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
941 return NET_RX_DROP; 941 return NET_RX_DROP;
942 942
943 if (!pskb_may_pull(skb, 943 if (!pskb_may_pull(skb,
944 sizeof(struct iphdr) + 944 sizeof(struct iphdr) +
945 sizeof(struct udphdr))) 945 sizeof(struct udphdr)))
946 goto drop; 946 goto drop;
947 947
948 b = (struct bootp_pkt *)skb_network_header(skb); 948 b = (struct bootp_pkt *)skb_network_header(skb);
949 h = &b->iph; 949 h = &b->iph;
950 950
951 if (h->ihl != 5 || h->version != 4 || h->protocol != IPPROTO_UDP) 951 if (h->ihl != 5 || h->version != 4 || h->protocol != IPPROTO_UDP)
952 goto drop; 952 goto drop;
953 953
954 /* Fragments are not supported */ 954 /* Fragments are not supported */
955 if (ip_is_fragment(h)) { 955 if (ip_is_fragment(h)) {
956 net_err_ratelimited("DHCP/BOOTP: Ignoring fragmented reply\n"); 956 net_err_ratelimited("DHCP/BOOTP: Ignoring fragmented reply\n");
957 goto drop; 957 goto drop;
958 } 958 }
959 959
960 if (skb->len < ntohs(h->tot_len)) 960 if (skb->len < ntohs(h->tot_len))
961 goto drop; 961 goto drop;
962 962
963 if (ip_fast_csum((char *) h, h->ihl)) 963 if (ip_fast_csum((char *) h, h->ihl))
964 goto drop; 964 goto drop;
965 965
966 if (b->udph.source != htons(67) || b->udph.dest != htons(68)) 966 if (b->udph.source != htons(67) || b->udph.dest != htons(68))
967 goto drop; 967 goto drop;
968 968
969 if (ntohs(h->tot_len) < ntohs(b->udph.len) + sizeof(struct iphdr)) 969 if (ntohs(h->tot_len) < ntohs(b->udph.len) + sizeof(struct iphdr))
970 goto drop; 970 goto drop;
971 971
972 len = ntohs(b->udph.len) - sizeof(struct udphdr); 972 len = ntohs(b->udph.len) - sizeof(struct udphdr);
973 ext_len = len - (sizeof(*b) - 973 ext_len = len - (sizeof(*b) -
974 sizeof(struct iphdr) - 974 sizeof(struct iphdr) -
975 sizeof(struct udphdr) - 975 sizeof(struct udphdr) -
976 sizeof(b->exten)); 976 sizeof(b->exten));
977 if (ext_len < 0) 977 if (ext_len < 0)
978 goto drop; 978 goto drop;
979 979
980 /* Ok the front looks good, make sure we can get at the rest. */ 980 /* Ok the front looks good, make sure we can get at the rest. */
981 if (!pskb_may_pull(skb, skb->len)) 981 if (!pskb_may_pull(skb, skb->len))
982 goto drop; 982 goto drop;
983 983
984 b = (struct bootp_pkt *)skb_network_header(skb); 984 b = (struct bootp_pkt *)skb_network_header(skb);
985 h = &b->iph; 985 h = &b->iph;
986 986
987 /* One reply at a time, please. */ 987 /* One reply at a time, please. */
988 spin_lock(&ic_recv_lock); 988 spin_lock(&ic_recv_lock);
989 989
990 /* If we already have a reply, just drop the packet */ 990 /* If we already have a reply, just drop the packet */
991 if (ic_got_reply) 991 if (ic_got_reply)
992 goto drop_unlock; 992 goto drop_unlock;
993 993
994 /* Find the ic_device that the packet arrived on */ 994 /* Find the ic_device that the packet arrived on */
995 d = ic_first_dev; 995 d = ic_first_dev;
996 while (d && d->dev != dev) 996 while (d && d->dev != dev)
997 d = d->next; 997 d = d->next;
998 if (!d) 998 if (!d)
999 goto drop_unlock; /* should never happen */ 999 goto drop_unlock; /* should never happen */
1000 1000
1001 /* Is it a reply to our BOOTP request? */ 1001 /* Is it a reply to our BOOTP request? */
1002 if (b->op != BOOTP_REPLY || 1002 if (b->op != BOOTP_REPLY ||
1003 b->xid != d->xid) { 1003 b->xid != d->xid) {
1004 net_err_ratelimited("DHCP/BOOTP: Reply not for us, op[%x] xid[%x]\n", 1004 net_err_ratelimited("DHCP/BOOTP: Reply not for us, op[%x] xid[%x]\n",
1005 b->op, b->xid); 1005 b->op, b->xid);
1006 goto drop_unlock; 1006 goto drop_unlock;
1007 } 1007 }
1008 1008
1009 /* Is it a reply for the device we are configuring? */ 1009 /* Is it a reply for the device we are configuring? */
1010 if (b->xid != ic_dev_xid) { 1010 if (b->xid != ic_dev_xid) {
1011 net_err_ratelimited("DHCP/BOOTP: Ignoring delayed packet\n"); 1011 net_err_ratelimited("DHCP/BOOTP: Ignoring delayed packet\n");
1012 goto drop_unlock; 1012 goto drop_unlock;
1013 } 1013 }
1014 1014
1015 /* Parse extensions */ 1015 /* Parse extensions */
1016 if (ext_len >= 4 && 1016 if (ext_len >= 4 &&
1017 !memcmp(b->exten, ic_bootp_cookie, 4)) { /* Check magic cookie */ 1017 !memcmp(b->exten, ic_bootp_cookie, 4)) { /* Check magic cookie */
1018 u8 *end = (u8 *) b + ntohs(b->iph.tot_len); 1018 u8 *end = (u8 *) b + ntohs(b->iph.tot_len);
1019 u8 *ext; 1019 u8 *ext;
1020 1020
1021 #ifdef IPCONFIG_DHCP 1021 #ifdef IPCONFIG_DHCP
1022 if (ic_proto_enabled & IC_USE_DHCP) { 1022 if (ic_proto_enabled & IC_USE_DHCP) {
1023 __be32 server_id = NONE; 1023 __be32 server_id = NONE;
1024 int mt = 0; 1024 int mt = 0;
1025 1025
1026 ext = &b->exten[4]; 1026 ext = &b->exten[4];
1027 while (ext < end && *ext != 0xff) { 1027 while (ext < end && *ext != 0xff) {
1028 u8 *opt = ext++; 1028 u8 *opt = ext++;
1029 if (*opt == 0) /* Padding */ 1029 if (*opt == 0) /* Padding */
1030 continue; 1030 continue;
1031 ext += *ext + 1; 1031 ext += *ext + 1;
1032 if (ext >= end) 1032 if (ext >= end)
1033 break; 1033 break;
1034 switch (*opt) { 1034 switch (*opt) {
1035 case 53: /* Message type */ 1035 case 53: /* Message type */
1036 if (opt[1]) 1036 if (opt[1])
1037 mt = opt[2]; 1037 mt = opt[2];
1038 break; 1038 break;
1039 case 54: /* Server ID (IP address) */ 1039 case 54: /* Server ID (IP address) */
1040 if (opt[1] >= 4) 1040 if (opt[1] >= 4)
1041 memcpy(&server_id, opt + 2, 4); 1041 memcpy(&server_id, opt + 2, 4);
1042 break; 1042 break;
1043 } 1043 }
1044 } 1044 }
1045 1045
1046 #ifdef IPCONFIG_DEBUG 1046 #ifdef IPCONFIG_DEBUG
1047 printk("DHCP: Got message type %d\n", mt); 1047 printk("DHCP: Got message type %d\n", mt);
1048 #endif 1048 #endif
1049 1049
1050 switch (mt) { 1050 switch (mt) {
1051 case DHCPOFFER: 1051 case DHCPOFFER:
1052 /* While in the process of accepting one offer, 1052 /* While in the process of accepting one offer,
1053 * ignore all others. 1053 * ignore all others.
1054 */ 1054 */
1055 if (ic_myaddr != NONE) 1055 if (ic_myaddr != NONE)
1056 goto drop_unlock; 1056 goto drop_unlock;
1057 1057
1058 /* Let's accept that offer. */ 1058 /* Let's accept that offer. */
1059 ic_myaddr = b->your_ip; 1059 ic_myaddr = b->your_ip;
1060 ic_servaddr = server_id; 1060 ic_servaddr = server_id;
1061 #ifdef IPCONFIG_DEBUG 1061 #ifdef IPCONFIG_DEBUG
1062 printk("DHCP: Offered address %pI4 by server %pI4\n", 1062 printk("DHCP: Offered address %pI4 by server %pI4\n",
1063 &ic_myaddr, &ic_servaddr); 1063 &ic_myaddr, &ic_servaddr);
1064 #endif 1064 #endif
1065 /* The DHCP indicated server address takes 1065 /* The DHCP indicated server address takes
1066 * precedence over the bootp header one if 1066 * precedence over the bootp header one if
1067 * they are different. 1067 * they are different.
1068 */ 1068 */
1069 if ((server_id != NONE) && 1069 if ((server_id != NONE) &&
1070 (b->server_ip != server_id)) 1070 (b->server_ip != server_id))
1071 b->server_ip = ic_servaddr; 1071 b->server_ip = ic_servaddr;
1072 break; 1072 break;
1073 1073
1074 case DHCPACK: 1074 case DHCPACK:
1075 if (memcmp(dev->dev_addr, b->hw_addr, dev->addr_len) != 0) 1075 if (memcmp(dev->dev_addr, b->hw_addr, dev->addr_len) != 0)
1076 goto drop_unlock; 1076 goto drop_unlock;
1077 1077
1078 /* Yeah! */ 1078 /* Yeah! */
1079 break; 1079 break;
1080 1080
1081 default: 1081 default:
1082 /* Urque. Forget it*/ 1082 /* Urque. Forget it*/
1083 ic_myaddr = NONE; 1083 ic_myaddr = NONE;
1084 ic_servaddr = NONE; 1084 ic_servaddr = NONE;
1085 goto drop_unlock; 1085 goto drop_unlock;
1086 } 1086 }
1087 1087
1088 ic_dhcp_msgtype = mt; 1088 ic_dhcp_msgtype = mt;
1089 1089
1090 } 1090 }
1091 #endif /* IPCONFIG_DHCP */ 1091 #endif /* IPCONFIG_DHCP */
1092 1092
1093 ext = &b->exten[4]; 1093 ext = &b->exten[4];
1094 while (ext < end && *ext != 0xff) { 1094 while (ext < end && *ext != 0xff) {
1095 u8 *opt = ext++; 1095 u8 *opt = ext++;
1096 if (*opt == 0) /* Padding */ 1096 if (*opt == 0) /* Padding */
1097 continue; 1097 continue;
1098 ext += *ext + 1; 1098 ext += *ext + 1;
1099 if (ext < end) 1099 if (ext < end)
1100 ic_do_bootp_ext(opt); 1100 ic_do_bootp_ext(opt);
1101 } 1101 }
1102 } 1102 }
1103 1103
1104 /* We have a winner! */ 1104 /* We have a winner! */
1105 ic_dev = dev; 1105 ic_dev = dev;
1106 ic_myaddr = b->your_ip; 1106 ic_myaddr = b->your_ip;
1107 ic_servaddr = b->server_ip; 1107 ic_servaddr = b->server_ip;
1108 if (ic_gateway == NONE && b->relay_ip) 1108 if (ic_gateway == NONE && b->relay_ip)
1109 ic_gateway = b->relay_ip; 1109 ic_gateway = b->relay_ip;
1110 if (ic_nameservers[0] == NONE) 1110 if (ic_nameservers[0] == NONE)
1111 ic_nameservers[0] = ic_servaddr; 1111 ic_nameservers[0] = ic_servaddr;
1112 ic_got_reply = IC_BOOTP; 1112 ic_got_reply = IC_BOOTP;
1113 1113
1114 drop_unlock: 1114 drop_unlock:
1115 /* Show's over. Nothing to see here. */ 1115 /* Show's over. Nothing to see here. */
1116 spin_unlock(&ic_recv_lock); 1116 spin_unlock(&ic_recv_lock);
1117 1117
1118 drop: 1118 drop:
1119 /* Throw the packet out. */ 1119 /* Throw the packet out. */
1120 kfree_skb(skb); 1120 kfree_skb(skb);
1121 1121
1122 return 0; 1122 return 0;
1123 } 1123 }
1124 1124
1125 1125
1126 #endif 1126 #endif
1127 1127
1128 1128
1129 /* 1129 /*
1130 * Dynamic IP configuration -- DHCP, BOOTP, RARP. 1130 * Dynamic IP configuration -- DHCP, BOOTP, RARP.
1131 */ 1131 */
1132 1132
1133 #ifdef IPCONFIG_DYNAMIC 1133 #ifdef IPCONFIG_DYNAMIC
1134 1134
1135 static int __init ic_dynamic(void) 1135 static int __init ic_dynamic(void)
1136 { 1136 {
1137 int retries; 1137 int retries;
1138 struct ic_device *d; 1138 struct ic_device *d;
1139 unsigned long start_jiffies, timeout, jiff; 1139 unsigned long start_jiffies, timeout, jiff;
1140 int do_bootp = ic_proto_have_if & IC_BOOTP; 1140 int do_bootp = ic_proto_have_if & IC_BOOTP;
1141 int do_rarp = ic_proto_have_if & IC_RARP; 1141 int do_rarp = ic_proto_have_if & IC_RARP;
1142 1142
1143 /* 1143 /*
1144 * If none of DHCP/BOOTP/RARP was selected, return with an error. 1144 * If none of DHCP/BOOTP/RARP was selected, return with an error.
1145 * This routine gets only called when some pieces of information 1145 * This routine gets only called when some pieces of information
1146 * are missing, and without DHCP/BOOTP/RARP we are unable to get it. 1146 * are missing, and without DHCP/BOOTP/RARP we are unable to get it.
1147 */ 1147 */
1148 if (!ic_proto_enabled) { 1148 if (!ic_proto_enabled) {
1149 pr_err("IP-Config: Incomplete network configuration information\n"); 1149 pr_err("IP-Config: Incomplete network configuration information\n");
1150 return -1; 1150 return -1;
1151 } 1151 }
1152 1152
1153 #ifdef IPCONFIG_BOOTP 1153 #ifdef IPCONFIG_BOOTP
1154 if ((ic_proto_enabled ^ ic_proto_have_if) & IC_BOOTP) 1154 if ((ic_proto_enabled ^ ic_proto_have_if) & IC_BOOTP)
1155 pr_err("DHCP/BOOTP: No suitable device found\n"); 1155 pr_err("DHCP/BOOTP: No suitable device found\n");
1156 #endif 1156 #endif
1157 #ifdef IPCONFIG_RARP 1157 #ifdef IPCONFIG_RARP
1158 if ((ic_proto_enabled ^ ic_proto_have_if) & IC_RARP) 1158 if ((ic_proto_enabled ^ ic_proto_have_if) & IC_RARP)
1159 pr_err("RARP: No suitable device found\n"); 1159 pr_err("RARP: No suitable device found\n");
1160 #endif 1160 #endif
1161 1161
1162 if (!ic_proto_have_if) 1162 if (!ic_proto_have_if)
1163 /* Error message already printed */ 1163 /* Error message already printed */
1164 return -1; 1164 return -1;
1165 1165
1166 /* 1166 /*
1167 * Setup protocols 1167 * Setup protocols
1168 */ 1168 */
1169 #ifdef IPCONFIG_BOOTP 1169 #ifdef IPCONFIG_BOOTP
1170 if (do_bootp) 1170 if (do_bootp)
1171 ic_bootp_init(); 1171 ic_bootp_init();
1172 #endif 1172 #endif
1173 #ifdef IPCONFIG_RARP 1173 #ifdef IPCONFIG_RARP
1174 if (do_rarp) 1174 if (do_rarp)
1175 ic_rarp_init(); 1175 ic_rarp_init();
1176 #endif 1176 #endif
1177 1177
1178 /* 1178 /*
1179 * Send requests and wait, until we get an answer. This loop 1179 * Send requests and wait, until we get an answer. This loop
1180 * seems to be a terrible waste of CPU time, but actually there is 1180 * seems to be a terrible waste of CPU time, but actually there is
1181 * only one process running at all, so we don't need to use any 1181 * only one process running at all, so we don't need to use any
1182 * scheduler functions. 1182 * scheduler functions.
1183 * [Actually we could now, but the nothing else running note still 1183 * [Actually we could now, but the nothing else running note still
1184 * applies.. - AC] 1184 * applies.. - AC]
1185 */ 1185 */
1186 pr_notice("Sending %s%s%s requests .", 1186 pr_notice("Sending %s%s%s requests .",
1187 do_bootp 1187 do_bootp
1188 ? ((ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP") : "", 1188 ? ((ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP") : "",
1189 (do_bootp && do_rarp) ? " and " : "", 1189 (do_bootp && do_rarp) ? " and " : "",
1190 do_rarp ? "RARP" : ""); 1190 do_rarp ? "RARP" : "");
1191 1191
1192 start_jiffies = jiffies; 1192 start_jiffies = jiffies;
1193 d = ic_first_dev; 1193 d = ic_first_dev;
1194 retries = CONF_SEND_RETRIES; 1194 retries = CONF_SEND_RETRIES;
1195 get_random_bytes(&timeout, sizeof(timeout)); 1195 get_random_bytes(&timeout, sizeof(timeout));
1196 timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned int) CONF_TIMEOUT_RANDOM); 1196 timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned int) CONF_TIMEOUT_RANDOM);
1197 for (;;) { 1197 for (;;) {
1198 /* Track the device we are configuring */ 1198 /* Track the device we are configuring */
1199 ic_dev_xid = d->xid; 1199 ic_dev_xid = d->xid;
1200 1200
1201 #ifdef IPCONFIG_BOOTP 1201 #ifdef IPCONFIG_BOOTP
1202 if (do_bootp && (d->able & IC_BOOTP)) 1202 if (do_bootp && (d->able & IC_BOOTP))
1203 ic_bootp_send_if(d, jiffies - start_jiffies); 1203 ic_bootp_send_if(d, jiffies - start_jiffies);
1204 #endif 1204 #endif
1205 #ifdef IPCONFIG_RARP 1205 #ifdef IPCONFIG_RARP
1206 if (do_rarp && (d->able & IC_RARP)) 1206 if (do_rarp && (d->able & IC_RARP))
1207 ic_rarp_send_if(d); 1207 ic_rarp_send_if(d);
1208 #endif 1208 #endif
1209 1209
1210 jiff = jiffies + (d->next ? CONF_INTER_TIMEOUT : timeout); 1210 jiff = jiffies + (d->next ? CONF_INTER_TIMEOUT : timeout);
1211 while (time_before(jiffies, jiff) && !ic_got_reply) 1211 while (time_before(jiffies, jiff) && !ic_got_reply)
1212 schedule_timeout_uninterruptible(1); 1212 schedule_timeout_uninterruptible(1);
1213 #ifdef IPCONFIG_DHCP 1213 #ifdef IPCONFIG_DHCP
1214 /* DHCP isn't done until we get a DHCPACK. */ 1214 /* DHCP isn't done until we get a DHCPACK. */
1215 if ((ic_got_reply & IC_BOOTP) && 1215 if ((ic_got_reply & IC_BOOTP) &&
1216 (ic_proto_enabled & IC_USE_DHCP) && 1216 (ic_proto_enabled & IC_USE_DHCP) &&
1217 ic_dhcp_msgtype != DHCPACK) { 1217 ic_dhcp_msgtype != DHCPACK) {
1218 ic_got_reply = 0; 1218 ic_got_reply = 0;
1219 pr_cont(","); 1219 pr_cont(",");
1220 continue; 1220 continue;
1221 } 1221 }
1222 #endif /* IPCONFIG_DHCP */ 1222 #endif /* IPCONFIG_DHCP */
1223 1223
1224 if (ic_got_reply) { 1224 if (ic_got_reply) {
1225 pr_cont(" OK\n"); 1225 pr_cont(" OK\n");
1226 break; 1226 break;
1227 } 1227 }
1228 1228
1229 if ((d = d->next)) 1229 if ((d = d->next))
1230 continue; 1230 continue;
1231 1231
1232 if (! --retries) { 1232 if (! --retries) {
1233 pr_cont(" timed out!\n"); 1233 pr_cont(" timed out!\n");
1234 break; 1234 break;
1235 } 1235 }
1236 1236
1237 d = ic_first_dev; 1237 d = ic_first_dev;
1238 1238
1239 timeout = timeout CONF_TIMEOUT_MULT; 1239 timeout = timeout CONF_TIMEOUT_MULT;
1240 if (timeout > CONF_TIMEOUT_MAX) 1240 if (timeout > CONF_TIMEOUT_MAX)
1241 timeout = CONF_TIMEOUT_MAX; 1241 timeout = CONF_TIMEOUT_MAX;
1242 1242
1243 pr_cont("."); 1243 pr_cont(".");
1244 } 1244 }
1245 1245
1246 #ifdef IPCONFIG_BOOTP 1246 #ifdef IPCONFIG_BOOTP
1247 if (do_bootp) 1247 if (do_bootp)
1248 ic_bootp_cleanup(); 1248 ic_bootp_cleanup();
1249 #endif 1249 #endif
1250 #ifdef IPCONFIG_RARP 1250 #ifdef IPCONFIG_RARP
1251 if (do_rarp) 1251 if (do_rarp)
1252 ic_rarp_cleanup(); 1252 ic_rarp_cleanup();
1253 #endif 1253 #endif
1254 1254
1255 if (!ic_got_reply) { 1255 if (!ic_got_reply) {
1256 ic_myaddr = NONE; 1256 ic_myaddr = NONE;
1257 return -1; 1257 return -1;
1258 } 1258 }
1259 1259
1260 printk("IP-Config: Got %s answer from %pI4, ", 1260 printk("IP-Config: Got %s answer from %pI4, ",
1261 ((ic_got_reply & IC_RARP) ? "RARP" 1261 ((ic_got_reply & IC_RARP) ? "RARP"
1262 : (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"), 1262 : (ic_proto_enabled & IC_USE_DHCP) ? "DHCP" : "BOOTP"),
1263 &ic_servaddr); 1263 &ic_servaddr);
1264 pr_cont("my address is %pI4\n", &ic_myaddr); 1264 pr_cont("my address is %pI4\n", &ic_myaddr);
1265 1265
1266 return 0; 1266 return 0;
1267 } 1267 }
1268 1268
1269 #endif /* IPCONFIG_DYNAMIC */ 1269 #endif /* IPCONFIG_DYNAMIC */
1270 1270
1271 #ifdef CONFIG_PROC_FS 1271 #ifdef CONFIG_PROC_FS
1272 1272
1273 static int pnp_seq_show(struct seq_file *seq, void *v) 1273 static int pnp_seq_show(struct seq_file *seq, void *v)
1274 { 1274 {
1275 int i; 1275 int i;
1276 1276
1277 if (ic_proto_used & IC_PROTO) 1277 if (ic_proto_used & IC_PROTO)
1278 seq_printf(seq, "#PROTO: %s\n", 1278 seq_printf(seq, "#PROTO: %s\n",
1279 (ic_proto_used & IC_RARP) ? "RARP" 1279 (ic_proto_used & IC_RARP) ? "RARP"
1280 : (ic_proto_used & IC_USE_DHCP) ? "DHCP" : "BOOTP"); 1280 : (ic_proto_used & IC_USE_DHCP) ? "DHCP" : "BOOTP");
1281 else 1281 else
1282 seq_puts(seq, "#MANUAL\n"); 1282 seq_puts(seq, "#MANUAL\n");
1283 1283
1284 if (ic_domain[0]) 1284 if (ic_domain[0])
1285 seq_printf(seq, 1285 seq_printf(seq,
1286 "domain %s\n", ic_domain); 1286 "domain %s\n", ic_domain);
1287 for (i = 0; i < CONF_NAMESERVERS_MAX; i++) { 1287 for (i = 0; i < CONF_NAMESERVERS_MAX; i++) {
1288 if (ic_nameservers[i] != NONE) 1288 if (ic_nameservers[i] != NONE)
1289 seq_printf(seq, "nameserver %pI4\n", 1289 seq_printf(seq, "nameserver %pI4\n",
1290 &ic_nameservers[i]); 1290 &ic_nameservers[i]);
1291 } 1291 }
1292 if (ic_servaddr != NONE) 1292 if (ic_servaddr != NONE)
1293 seq_printf(seq, "bootserver %pI4\n", 1293 seq_printf(seq, "bootserver %pI4\n",
1294 &ic_servaddr); 1294 &ic_servaddr);
1295 return 0; 1295 return 0;
1296 } 1296 }
1297 1297
1298 static int pnp_seq_open(struct inode *indoe, struct file *file) 1298 static int pnp_seq_open(struct inode *indoe, struct file *file)
1299 { 1299 {
1300 return single_open(file, pnp_seq_show, NULL); 1300 return single_open(file, pnp_seq_show, NULL);
1301 } 1301 }
1302 1302
1303 static const struct file_operations pnp_seq_fops = { 1303 static const struct file_operations pnp_seq_fops = {
1304 .owner = THIS_MODULE, 1304 .owner = THIS_MODULE,
1305 .open = pnp_seq_open, 1305 .open = pnp_seq_open,
1306 .read = seq_read, 1306 .read = seq_read,
1307 .llseek = seq_lseek, 1307 .llseek = seq_lseek,
1308 .release = single_release, 1308 .release = single_release,
1309 }; 1309 };
1310 #endif /* CONFIG_PROC_FS */ 1310 #endif /* CONFIG_PROC_FS */
1311 1311
1312 /* 1312 /*
1313 * Extract IP address from the parameter string if needed. Note that we 1313 * Extract IP address from the parameter string if needed. Note that we
1314 * need to have root_server_addr set _before_ IPConfig gets called as it 1314 * need to have root_server_addr set _before_ IPConfig gets called as it
1315 * can override it. 1315 * can override it.
1316 */ 1316 */
1317 __be32 __init root_nfs_parse_addr(char *name) 1317 __be32 __init root_nfs_parse_addr(char *name)
1318 { 1318 {
1319 __be32 addr; 1319 __be32 addr;
1320 int octets = 0; 1320 int octets = 0;
1321 char *cp, *cq; 1321 char *cp, *cq;
1322 1322
1323 cp = cq = name; 1323 cp = cq = name;
1324 while (octets < 4) { 1324 while (octets < 4) {
1325 while (*cp >= '0' && *cp <= '9') 1325 while (*cp >= '0' && *cp <= '9')
1326 cp++; 1326 cp++;
1327 if (cp == cq || cp - cq > 3) 1327 if (cp == cq || cp - cq > 3)
1328 break; 1328 break;
1329 if (*cp == '.' || octets == 3) 1329 if (*cp == '.' || octets == 3)
1330 octets++; 1330 octets++;
1331 if (octets < 4) 1331 if (octets < 4)
1332 cp++; 1332 cp++;
1333 cq = cp; 1333 cq = cp;
1334 } 1334 }
1335 if (octets == 4 && (*cp == ':' || *cp == '\0')) { 1335 if (octets == 4 && (*cp == ':' || *cp == '\0')) {
1336 if (*cp == ':') 1336 if (*cp == ':')
1337 *cp++ = '\0'; 1337 *cp++ = '\0';
1338 addr = in_aton(name); 1338 addr = in_aton(name);
1339 memmove(name, cp, strlen(cp) + 1); 1339 memmove(name, cp, strlen(cp) + 1);
1340 } else 1340 } else
1341 addr = NONE; 1341 addr = NONE;
1342 1342
1343 return addr; 1343 return addr;
1344 } 1344 }
1345 1345
1346 #define DEVICE_WAIT_MAX 12 /* 12 seconds */ 1346 #define DEVICE_WAIT_MAX 12 /* 12 seconds */
1347 1347
1348 static int __init wait_for_devices(void) 1348 static int __init wait_for_devices(void)
1349 { 1349 {
1350 int i; 1350 int i;
1351 1351
1352 for (i = 0; i < DEVICE_WAIT_MAX; i++) { 1352 for (i = 0; i < DEVICE_WAIT_MAX; i++) {
1353 struct net_device *dev; 1353 struct net_device *dev;
1354 int found = 0; 1354 int found = 0;
1355 1355
1356 rtnl_lock(); 1356 rtnl_lock();
1357 for_each_netdev(&init_net, dev) { 1357 for_each_netdev(&init_net, dev) {
1358 if (ic_is_init_dev(dev)) { 1358 if (ic_is_init_dev(dev)) {
1359 found = 1; 1359 found = 1;
1360 break; 1360 break;
1361 } 1361 }
1362 } 1362 }
1363 rtnl_unlock(); 1363 rtnl_unlock();
1364 if (found) 1364 if (found)
1365 return 0; 1365 return 0;
1366 ssleep(1); 1366 ssleep(1);
1367 } 1367 }
1368 return -ENODEV; 1368 return -ENODEV;
1369 } 1369 }
1370 1370
1371 /* 1371 /*
1372 * IP Autoconfig dispatcher. 1372 * IP Autoconfig dispatcher.
1373 */ 1373 */
1374 1374
1375 static int __init ip_auto_config(void) 1375 static int __init ip_auto_config(void)
1376 { 1376 {
1377 __be32 addr; 1377 __be32 addr;
1378 #ifdef IPCONFIG_DYNAMIC 1378 #ifdef IPCONFIG_DYNAMIC
1379 int retries = CONF_OPEN_RETRIES; 1379 int retries = CONF_OPEN_RETRIES;
1380 #endif 1380 #endif
1381 int err; 1381 int err;
1382 1382
1383 #ifdef CONFIG_PROC_FS 1383 #ifdef CONFIG_PROC_FS
1384 proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops); 1384 proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
1385 #endif /* CONFIG_PROC_FS */ 1385 #endif /* CONFIG_PROC_FS */
1386 1386
1387 if (!ic_enable) 1387 if (!ic_enable)
1388 return 0; 1388 return 0;
1389 1389
1390 DBG(("IP-Config: Entered.\n")); 1390 DBG(("IP-Config: Entered.\n"));
1391 #ifdef IPCONFIG_DYNAMIC 1391 #ifdef IPCONFIG_DYNAMIC
1392 try_try_again: 1392 try_try_again:
1393 #endif 1393 #endif
1394 /* Wait for devices to appear */ 1394 /* Wait for devices to appear */
1395 err = wait_for_devices(); 1395 err = wait_for_devices();
1396 if (err) 1396 if (err)
1397 return err; 1397 return err;
1398 1398
1399 /* Setup all network devices */ 1399 /* Setup all network devices */
1400 err = ic_open_devs(); 1400 err = ic_open_devs();
1401 if (err) 1401 if (err)
1402 return err; 1402 return err;
1403 1403
1404 /* Give drivers a chance to settle */ 1404 /* Give drivers a chance to settle */
1405 msleep(CONF_POST_OPEN); 1405 msleep(CONF_POST_OPEN);
1406 1406
1407 /* 1407 /*
1408 * If the config information is insufficient (e.g., our IP address or 1408 * If the config information is insufficient (e.g., our IP address or
1409 * IP address of the boot server is missing or we have multiple network 1409 * IP address of the boot server is missing or we have multiple network
1410 * interfaces and no default was set), use BOOTP or RARP to get the 1410 * interfaces and no default was set), use BOOTP or RARP to get the
1411 * missing values. 1411 * missing values.
1412 */ 1412 */
1413 if (ic_myaddr == NONE || 1413 if (ic_myaddr == NONE ||
1414 #ifdef CONFIG_ROOT_NFS 1414 #ifdef CONFIG_ROOT_NFS
1415 (root_server_addr == NONE && 1415 (root_server_addr == NONE &&
1416 ic_servaddr == NONE && 1416 ic_servaddr == NONE &&
1417 ROOT_DEV == Root_NFS) || 1417 ROOT_DEV == Root_NFS) ||
1418 #endif 1418 #endif
1419 ic_first_dev->next) { 1419 ic_first_dev->next) {
1420 #ifdef IPCONFIG_DYNAMIC 1420 #ifdef IPCONFIG_DYNAMIC
1421 if (ic_dynamic() < 0) { 1421 if (ic_dynamic() < 0) {
1422 ic_close_devs(); 1422 ic_close_devs();
1423 1423
1424 /* 1424 /*
1425 * I don't know why, but sometimes the 1425 * I don't know why, but sometimes the
1426 * eepro100 driver (at least) gets upset and 1426 * eepro100 driver (at least) gets upset and
1427 * doesn't work the first time it's opened. 1427 * doesn't work the first time it's opened.
1428 * But then if you close it and reopen it, it 1428 * But then if you close it and reopen it, it
1429 * works just fine. So we need to try that at 1429 * works just fine. So we need to try that at
1430 * least once before giving up. 1430 * least once before giving up.
1431 * 1431 *
1432 * Also, if the root will be NFS-mounted, we 1432 * Also, if the root will be NFS-mounted, we
1433 * have nowhere to go if DHCP fails. So we 1433 * have nowhere to go if DHCP fails. So we
1434 * just have to keep trying forever. 1434 * just have to keep trying forever.
1435 * 1435 *
1436 * -- Chip 1436 * -- Chip
1437 */ 1437 */
1438 #ifdef CONFIG_ROOT_NFS 1438 #ifdef CONFIG_ROOT_NFS
1439 if (ROOT_DEV == Root_NFS) { 1439 if (ROOT_DEV == Root_NFS) {
1440 pr_err("IP-Config: Retrying forever (NFS root)...\n"); 1440 pr_err("IP-Config: Retrying forever (NFS root)...\n");
1441 goto try_try_again; 1441 goto try_try_again;
1442 } 1442 }
1443 #endif 1443 #endif
1444 1444
1445 if (--retries) { 1445 if (--retries) {
1446 pr_err("IP-Config: Reopening network devices...\n"); 1446 pr_err("IP-Config: Reopening network devices...\n");
1447 goto try_try_again; 1447 goto try_try_again;
1448 } 1448 }
1449 1449
1450 /* Oh, well. At least we tried. */ 1450 /* Oh, well. At least we tried. */
1451 pr_err("IP-Config: Auto-configuration of network failed\n"); 1451 pr_err("IP-Config: Auto-configuration of network failed\n");
1452 return -1; 1452 return -1;
1453 } 1453 }
1454 #else /* !DYNAMIC */ 1454 #else /* !DYNAMIC */
1455 pr_err("IP-Config: Incomplete network configuration information\n"); 1455 pr_err("IP-Config: Incomplete network configuration information\n");
1456 ic_close_devs(); 1456 ic_close_devs();
1457 return -1; 1457 return -1;
1458 #endif /* IPCONFIG_DYNAMIC */ 1458 #endif /* IPCONFIG_DYNAMIC */
1459 } else { 1459 } else {
1460 /* Device selected manually or only one device -> use it */ 1460 /* Device selected manually or only one device -> use it */
1461 ic_dev = ic_first_dev->dev; 1461 ic_dev = ic_first_dev->dev;
1462 } 1462 }
1463 1463
1464 addr = root_nfs_parse_addr(root_server_path); 1464 addr = root_nfs_parse_addr(root_server_path);
1465 if (root_server_addr == NONE) 1465 if (root_server_addr == NONE)
1466 root_server_addr = addr; 1466 root_server_addr = addr;
1467 1467
1468 /* 1468 /*
1469 * Use defaults wherever applicable. 1469 * Use defaults wherever applicable.
1470 */ 1470 */
1471 if (ic_defaults() < 0) 1471 if (ic_defaults() < 0)
1472 return -1; 1472 return -1;
1473 1473
1474 /* 1474 /*
1475 * Close all network devices except the device we've 1475 * Close all network devices except the device we've
1476 * autoconfigured and set up routes. 1476 * autoconfigured and set up routes.
1477 */ 1477 */
1478 ic_close_devs(); 1478 ic_close_devs();
1479 if (ic_setup_if() < 0 || ic_setup_routes() < 0) 1479 if (ic_setup_if() < 0 || ic_setup_routes() < 0)
1480 return -1; 1480 return -1;
1481 1481
1482 /* 1482 /*
1483 * Record which protocol was actually used. 1483 * Record which protocol was actually used.
1484 */ 1484 */
1485 #ifdef IPCONFIG_DYNAMIC 1485 #ifdef IPCONFIG_DYNAMIC
1486 ic_proto_used = ic_got_reply | (ic_proto_enabled & IC_USE_DHCP); 1486 ic_proto_used = ic_got_reply | (ic_proto_enabled & IC_USE_DHCP);
1487 #endif 1487 #endif
1488 1488
1489 #ifndef IPCONFIG_SILENT 1489 #ifndef IPCONFIG_SILENT
1490 /* 1490 /*
1491 * Clue in the operator. 1491 * Clue in the operator.
1492 */ 1492 */
1493 pr_info("IP-Config: Complete:\n"); 1493 pr_info("IP-Config: Complete:\n");
1494 pr_info(" device=%s, addr=%pI4, mask=%pI4, gw=%pI4\n", 1494 pr_info(" device=%s, addr=%pI4, mask=%pI4, gw=%pI4\n",
1495 ic_dev->name, &ic_myaddr, &ic_netmask, &ic_gateway); 1495 ic_dev->name, &ic_myaddr, &ic_netmask, &ic_gateway);
1496 pr_info(" host=%s, domain=%s, nis-domain=%s\n", 1496 pr_info(" host=%s, domain=%s, nis-domain=%s\n",
1497 utsname()->nodename, ic_domain, utsname()->domainname); 1497 utsname()->nodename, ic_domain, utsname()->domainname);
1498 pr_info(" bootserver=%pI4, rootserver=%pI4, rootpath=%s", 1498 pr_info(" bootserver=%pI4, rootserver=%pI4, rootpath=%s",
1499 &ic_servaddr, &root_server_addr, root_server_path); 1499 &ic_servaddr, &root_server_addr, root_server_path);
1500 if (ic_dev_mtu) 1500 if (ic_dev_mtu)
1501 pr_cont(", mtu=%d", ic_dev_mtu); 1501 pr_cont(", mtu=%d", ic_dev_mtu);
1502 pr_cont("\n"); 1502 pr_cont("\n");
1503 #endif /* !SILENT */ 1503 #endif /* !SILENT */
1504 1504
1505 return 0; 1505 return 0;
1506 } 1506 }
1507 1507
1508 late_initcall(ip_auto_config); 1508 late_initcall(ip_auto_config);
1509 1509
1510 1510
1511 /* 1511 /*
1512 * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel 1512 * Decode any IP configuration options in the "ip=" or "nfsaddrs=" kernel
1513 * command line parameter. See Documentation/filesystems/nfs/nfsroot.txt. 1513 * command line parameter. See Documentation/filesystems/nfs/nfsroot.txt.
1514 */ 1514 */
1515 static int __init ic_proto_name(char *name) 1515 static int __init ic_proto_name(char *name)
1516 { 1516 {
1517 if (!strcmp(name, "on") || !strcmp(name, "any")) { 1517 if (!strcmp(name, "on") || !strcmp(name, "any")) {
1518 return 1; 1518 return 1;
1519 } 1519 }
1520 if (!strcmp(name, "off") || !strcmp(name, "none")) { 1520 if (!strcmp(name, "off") || !strcmp(name, "none")) {
1521 return 0; 1521 return 0;
1522 } 1522 }
1523 #ifdef CONFIG_IP_PNP_DHCP 1523 #ifdef CONFIG_IP_PNP_DHCP
1524 else if (!strcmp(name, "dhcp")) { 1524 else if (!strcmp(name, "dhcp")) {
1525 ic_proto_enabled &= ~IC_RARP; 1525 ic_proto_enabled &= ~IC_RARP;
1526 return 1; 1526 return 1;
1527 } 1527 }
1528 #endif 1528 #endif
1529 #ifdef CONFIG_IP_PNP_BOOTP 1529 #ifdef CONFIG_IP_PNP_BOOTP
1530 else if (!strcmp(name, "bootp")) { 1530 else if (!strcmp(name, "bootp")) {
1531 ic_proto_enabled &= ~(IC_RARP | IC_USE_DHCP); 1531 ic_proto_enabled &= ~(IC_RARP | IC_USE_DHCP);
1532 return 1; 1532 return 1;
1533 } 1533 }
1534 #endif 1534 #endif
1535 #ifdef CONFIG_IP_PNP_RARP 1535 #ifdef CONFIG_IP_PNP_RARP
1536 else if (!strcmp(name, "rarp")) { 1536 else if (!strcmp(name, "rarp")) {
1537 ic_proto_enabled &= ~(IC_BOOTP | IC_USE_DHCP); 1537 ic_proto_enabled &= ~(IC_BOOTP | IC_USE_DHCP);
1538 return 1; 1538 return 1;
1539 } 1539 }
1540 #endif 1540 #endif
1541 #ifdef IPCONFIG_DYNAMIC 1541 #ifdef IPCONFIG_DYNAMIC
1542 else if (!strcmp(name, "both")) { 1542 else if (!strcmp(name, "both")) {
1543 ic_proto_enabled &= ~IC_USE_DHCP; /* backward compat :-( */ 1543 ic_proto_enabled &= ~IC_USE_DHCP; /* backward compat :-( */
1544 return 1; 1544 return 1;
1545 } 1545 }
1546 #endif 1546 #endif
1547 return 0; 1547 return 0;
1548 } 1548 }
1549 1549
1550 static int __init ip_auto_config_setup(char *addrs) 1550 static int __init ip_auto_config_setup(char *addrs)
1551 { 1551 {
1552 char *cp, *ip, *dp; 1552 char *cp, *ip, *dp;
1553 int num = 0; 1553 int num = 0;
1554 1554
1555 ic_set_manually = 1; 1555 ic_set_manually = 1;
1556 ic_enable = 1; 1556 ic_enable = 1;
1557 1557
1558 /* 1558 /*
1559 * If any dhcp, bootp etc options are set, leave autoconfig on 1559 * If any dhcp, bootp etc options are set, leave autoconfig on
1560 * and skip the below static IP processing. 1560 * and skip the below static IP processing.
1561 */ 1561 */
1562 if (ic_proto_name(addrs)) 1562 if (ic_proto_name(addrs))
1563 return 1; 1563 return 1;
1564 1564
1565 /* If no static IP is given, turn off autoconfig and bail. */ 1565 /* If no static IP is given, turn off autoconfig and bail. */
1566 if (*addrs == 0 || 1566 if (*addrs == 0 ||
1567 strcmp(addrs, "off") == 0 || 1567 strcmp(addrs, "off") == 0 ||
1568 strcmp(addrs, "none") == 0) { 1568 strcmp(addrs, "none") == 0) {
1569 ic_enable = 0; 1569 ic_enable = 0;
1570 return 1; 1570 return 1;
1571 } 1571 }
1572 1572
1573 /* Parse string for static IP assignment. */ 1573 /* Parse string for static IP assignment. */
1574 ip = addrs; 1574 ip = addrs;
1575 while (ip && *ip) { 1575 while (ip && *ip) {
1576 if ((cp = strchr(ip, ':'))) 1576 if ((cp = strchr(ip, ':')))
1577 *cp++ = '\0'; 1577 *cp++ = '\0';
1578 if (strlen(ip) > 0) { 1578 if (strlen(ip) > 0) {
1579 DBG(("IP-Config: Parameter #%d: `%s'\n", num, ip)); 1579 DBG(("IP-Config: Parameter #%d: `%s'\n", num, ip));
1580 switch (num) { 1580 switch (num) {
1581 case 0: 1581 case 0:
1582 if ((ic_myaddr = in_aton(ip)) == ANY) 1582 if ((ic_myaddr = in_aton(ip)) == ANY)
1583 ic_myaddr = NONE; 1583 ic_myaddr = NONE;
1584 break; 1584 break;
1585 case 1: 1585 case 1:
1586 if ((ic_servaddr = in_aton(ip)) == ANY) 1586 if ((ic_servaddr = in_aton(ip)) == ANY)
1587 ic_servaddr = NONE; 1587 ic_servaddr = NONE;
1588 break; 1588 break;
1589 case 2: 1589 case 2:
1590 if ((ic_gateway = in_aton(ip)) == ANY) 1590 if ((ic_gateway = in_aton(ip)) == ANY)
1591 ic_gateway = NONE; 1591 ic_gateway = NONE;
1592 break; 1592 break;
1593 case 3: 1593 case 3:
1594 if ((ic_netmask = in_aton(ip)) == ANY) 1594 if ((ic_netmask = in_aton(ip)) == ANY)
1595 ic_netmask = NONE; 1595 ic_netmask = NONE;
1596 break; 1596 break;
1597 case 4: 1597 case 4:
1598 if ((dp = strchr(ip, '.'))) { 1598 if ((dp = strchr(ip, '.'))) {
1599 *dp++ = '\0'; 1599 *dp++ = '\0';
1600 strlcpy(utsname()->domainname, dp, 1600 strlcpy(utsname()->domainname, dp,
1601 sizeof(utsname()->domainname)); 1601 sizeof(utsname()->domainname));
1602 } 1602 }
1603 strlcpy(utsname()->nodename, ip, 1603 strlcpy(utsname()->nodename, ip,
1604 sizeof(utsname()->nodename)); 1604 sizeof(utsname()->nodename));
1605 ic_host_name_set = 1; 1605 ic_host_name_set = 1;
1606 break; 1606 break;
1607 case 5: 1607 case 5:
1608 strlcpy(user_dev_name, ip, sizeof(user_dev_name)); 1608 strlcpy(user_dev_name, ip, sizeof(user_dev_name));
1609 break; 1609 break;
1610 case 6: 1610 case 6:
1611 if (ic_proto_name(ip) == 0 && 1611 if (ic_proto_name(ip) == 0 &&
1612 ic_myaddr == NONE) { 1612 ic_myaddr == NONE) {
1613 ic_enable = 0; 1613 ic_enable = 0;
1614 } 1614 }
1615 break; 1615 break;
1616 } 1616 }
1617 } 1617 }
1618 ip = cp; 1618 ip = cp;
1619 num++; 1619 num++;
1620 } 1620 }
1621 1621
1622 return 1; 1622 return 1;
1623 } 1623 }
1624 __setup("ip=", ip_auto_config_setup);
1624 1625
1625 static int __init nfsaddrs_config_setup(char *addrs) 1626 static int __init nfsaddrs_config_setup(char *addrs)
1626 { 1627 {
1627 return ip_auto_config_setup(addrs); 1628 return ip_auto_config_setup(addrs);
1628 } 1629 }
1630 __setup("nfsaddrs=", nfsaddrs_config_setup);
1629 1631
1630 static int __init vendor_class_identifier_setup(char *addrs) 1632 static int __init vendor_class_identifier_setup(char *addrs)
1631 { 1633 {
1632 if (strlcpy(vendor_class_identifier, addrs, 1634 if (strlcpy(vendor_class_identifier, addrs,
1633 sizeof(vendor_class_identifier)) 1635 sizeof(vendor_class_identifier))
1634 >= sizeof(vendor_class_identifier)) 1636 >= sizeof(vendor_class_identifier))
1635 pr_warn("DHCP: vendorclass too long, truncated to \"%s\"", 1637 pr_warn("DHCP: vendorclass too long, truncated to \"%s\"",
1636 vendor_class_identifier); 1638 vendor_class_identifier);
1637 return 1; 1639 return 1;
1638 } 1640 }
1639
1640 __setup("ip=", ip_auto_config_setup);
1641 __setup("nfsaddrs=", nfsaddrs_config_setup);