[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20080628184136.A5610@ward.six>
Date: Sat, 28 Jun 2008 18:41:36 +0600
From: Denis Zaitceff <zaitceff@...il.com>
To: David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 2.6.25.8] ipconfig.c: extend the info in /proc/net/pnp
This patch extends the info shown thru /proc/net/pnp, making more ipv4
autoconf results accessible to user. The variables added are:
ic_myaddr
ic_netmask
ic_gateway
root_server_addr
root_server_path
ic_dev_name
This should make diskless clients more happy, as their startup scripts
would have more information.
Please apply the patch, would you consider it useful.
--- net/ipv4/ipconfig.c
+++ net/ipv4/ipconfig.c
@@ -183,6 +183,9 @@
static struct ic_device *ic_first_dev __initdata = NULL;/* List of open device */
static struct net_device *ic_dev __initdata = NULL; /* Selected device */
+#ifdef CONFIG_PROC_FS
+static u8 ic_dev_name[sizeof ic_dev->name];
+#endif
static int __init ic_open_devs(void)
{
@@ -1199,6 +1202,19 @@ static int pnp_seq_show(struct seq_file
{
int i;
+ const struct info {
+ __be32 *value;
+ const char *name;
+ } static list[]= {
+ {&ic_servaddr,"bootserver"},
+ {&ic_myaddr,"myaddr"},
+ {&ic_netmask,"netmask"},
+ {&ic_gateway,"gateway"},
+ {&root_server_addr,"rootserver"},
+ {NULL}
+ };
+ const struct info *p= list;
+
if (ic_proto_used & IC_PROTO)
seq_printf(seq, "#PROTO: %s\n",
(ic_proto_used & IC_RARP) ? "RARP"
@@ -1215,10 +1231,18 @@ static int pnp_seq_show(struct seq_file
"nameserver %u.%u.%u.%u\n",
NIPQUAD(ic_nameservers[i]));
}
- if (ic_servaddr != NONE)
- seq_printf(seq,
- "bootserver %u.%u.%u.%u\n",
- NIPQUAD(ic_servaddr));
+
+ do if (*p->value != NONE)
+ seq_printf(seq, "%s %u.%u.%u.%u\n",
+ p->name, NIPQUAD(*p->value));
+ while ((++p)->value);
+
+ if (root_server_path[0])
+ seq_printf(seq, "rootpath %s\n", root_server_path);
+
+ if (ic_dev_name[0])
+ seq_printf(seq, "device %s\n", ic_dev_name);
+
return 0;
}
@@ -1386,6 +1410,10 @@ static int __init ip_auto_config(void)
ic_proto_used = ic_got_reply | (ic_proto_enabled & IC_USE_DHCP);
#endif
+#ifdef CONFIG_PROC_FS
+ strcpy(ic_dev_name, ic_dev->name);
+#endif
+
#ifndef IPCONFIG_SILENT
/*
* Clue in the operator.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists