diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-03-18 17:17:51 +0000 |
| commit | f1382dc4850bb459d24a81c6cb0ef93ea7bd4a79 (patch) | |
| tree | 225271a3d5dcd4e9dea5ee393556abd754c964b1 /net/802 | |
| parent | 135b00fc2e90e605ac2a96b20b0ebd93851a3f89 (diff) | |
o Merge with Linux 2.1.90.
o Divide L1 cache sizes by 1024 before printing, makes the numbers a
bit more credible ...
Diffstat (limited to 'net/802')
| -rw-r--r-- | net/802/sysctl_net_802.c | 1 | ||||
| -rw-r--r-- | net/802/tr.c | 19 |
2 files changed, 12 insertions, 8 deletions
diff --git a/net/802/sysctl_net_802.c b/net/802/sysctl_net_802.c index f97141d3c..19cd47af5 100644 --- a/net/802/sysctl_net_802.c +++ b/net/802/sysctl_net_802.c @@ -23,5 +23,6 @@ extern int sysctl_tr_rif_timeout; ctl_table tr_table[] = { {NET_TR_RIF_TIMEOUT, "rif_timeout", &sysctl_tr_rif_timeout, sizeof(int), 0644, NULL, &proc_dointvec}, + {0} }; #endif diff --git a/net/802/tr.c b/net/802/tr.c index bf6cd83d7..3550b81ed 100644 --- a/net/802/tr.c +++ b/net/802/tr.c @@ -510,10 +510,18 @@ int rif_get_info(char *buffer,char **start, off_t offset, int length, int dummy) * Called during bootup. We don't actually have to initialise * too much for this. */ - + +#ifdef CONFIG_PROC_FS +static struct proc_dir_entry tr_rif_proc = { + PROC_NET_TR_RIF, 6, "tr_rif", + S_IFREG | S_IRUGO, 1, 0, 0, + 0, &proc_net_inode_operations, + rif_get_info +}; +#endif + __initfunc(void rif_init(struct net_proto *unused)) { - rif_timer.expires = RIF_TIMEOUT; rif_timer.data = 0L; rif_timer.function = rif_check_expire; @@ -521,11 +529,6 @@ __initfunc(void rif_init(struct net_proto *unused)) add_timer(&rif_timer); #ifdef CONFIG_PROC_FS - proc_net_register(&(struct proc_dir_entry) { - PROC_NET_TR_RIF, 6, "tr_rif", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_net_inode_operations, - rif_get_info - }); + proc_net_register(&tr_rif_proc); #endif } |