Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / net / ipconfig.h

diff --git a/include/net/ipconfig.h b/include/net/ipconfig.h
index faa9cef..3924d7d 100644 (file)
--- a/include/net/ipconfig.h
+++ b/include/net/ipconfig.h
@@ -8,29 +8,18 @@
 
 /* The following are initdata: */
 
-extern int ic_enable;          /* Enable or disable the whole shebang */
-
 extern int ic_proto_enabled;   /* Protocols enabled (see IC_xxx) */
-extern int ic_host_name_set;   /* Host name set by ipconfig? */
 extern int ic_set_manually;    /* IPconfig parameters set manually */
 
-extern u32 ic_myaddr;          /* My IP address */
-extern u32 ic_netmask;         /* Netmask for local subnet */
-extern u32 ic_gateway;         /* Gateway IP address */
+extern __be32 ic_myaddr;               /* My IP address */
+extern __be32 ic_gateway;              /* Gateway IP address */
 
-extern u32 ic_servaddr;                /* Boot server IP address */
+extern __be32 ic_servaddr;             /* Boot server IP address */
 
-extern u32 root_server_addr;   /* Address of NFS server */
+extern __be32 root_server_addr;        /* Address of NFS server */
 extern u8 root_server_path[];  /* Path to mount as root */
 
 
-
-/* The following are persistent (not initdata): */
-
-extern int ic_proto_used;      /* Protocol used, if any */
-extern u32 ic_nameserver;      /* DNS server IP address */
-extern u8 ic_domain[];         /* DNS (not NIS) domain name */
-
 /* bits in ic_proto_{enabled,used} */
 #define IC_PROTO       0xFF    /* Protocols mask: */
 #define IC_BOOTP       0x01    /*   BOOTP (or DHCP, see below) */