diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /net/bridge | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index 136c5c7c3..dc70cfe5d 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -831,14 +831,6 @@ int br_tree_get_info(char *buffer, char **start, off_t offset, int length, int d return len; } -#ifdef CONFIG_PROC_FS -struct proc_dir_entry proc_net_bridge= { - PROC_NET_BRIDGE, 6, "bridge", - S_IFREG | S_IRUGO, 1, 0, 0, - 0, &proc_net_inode_operations, - br_tree_get_info -}; -#endif void __init br_init(void) { /* (4.8.1) */ int port_no; @@ -895,9 +887,7 @@ void __init br_init(void) br_stats.exempt_protocols = 0; /*start_hello_timer();*/ /* Vova Oksman: register the function for the PROCfs "bridge" file */ -#ifdef CONFIG_PROC_FS - proc_net_register(&proc_net_bridge); -#endif + proc_net_create("bridge", 0, br_tree_get_info); } static inline unsigned short make_port_id(int port_no) |