patch-2.2.0-pre8 linux/net/ipv4/ipconfig.c

• Lines: 35
• Date: Sun Jan 17 10:00:00 1999
• Orig file: v2.2.0-pre7/linux/net/ipv4/ipconfig.c
• Orig date: Thu Jan 7 15:11:41 1999

diff -u --recursive --new-file v2.2.0-pre7/linux/net/ipv4/ipconfig.c linux/net/ipv4/ipconfig.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: ipconfig.c,v 1.18 1999/01/04 20:14:10 davem Exp $
+ *  $Id: ipconfig.c,v 1.19 1999/01/15 06:54:00 davem Exp $
  *
  *  Automatic Configuration of IP -- use BOOTP or RARP or user-supplied
  *  information to configure own IP address and routes.
@@ -73,7 +73,14 @@
 
 #define CONFIG_IP_PNP_DYNAMIC
 
-static int ic_proto_enabled __initdata = IC_BOOTP | IC_RARP;	/* Protocols enabled */
+static int ic_proto_enabled __initdata = 0			/* Protocols enabled */
+#ifdef CONFIG_IP_PNP_BOOTP
+			| IC_BOOTP
+#endif
+#ifdef CONFIG_IP_PNP_RARP
+			| IC_RARP
+#endif
+			;
 static int ic_got_reply __initdata = 0;				/* Protocol(s) we got reply from */
 
 #else
@@ -506,10 +513,9 @@
 	h->ihl = 5;
 	h->tot_len = htons(sizeof(struct bootp_pkt));
 	h->frag_off = htons(IP_DF);
-	h->ttl = 1;
+	h->ttl = 64;
 	h->protocol = IPPROTO_UDP;
 	h->daddr = INADDR_BROADCAST;
-	h->check = 0;
 	h->check = ip_fast_csum((unsigned char *) h, h->ihl);
 
 	/* Construct UDP header */