diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /net/netsyms.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'net/netsyms.c')
| -rw-r--r-- | net/netsyms.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/net/netsyms.c b/net/netsyms.c index b6f367df2..fbb07ab5a 100644 --- a/net/netsyms.c +++ b/net/netsyms.c @@ -28,12 +28,9 @@ #endif #include <net/pkt_sched.h> #include <net/scm.h> +#include <linux/if_bridge.h> #include <linux/random.h> -#ifdef CONFIG_BRIDGE -#include <net/br.h> -#endif - #ifdef CONFIG_NET extern __u32 sysctl_wmem_max; extern __u32 sysctl_rmem_max; @@ -217,10 +214,9 @@ EXPORT_SYMBOL(sklist_insert_socket); EXPORT_SYMBOL(scm_detach_fds); -#ifdef CONFIG_BRIDGE -EXPORT_SYMBOL(br_ioctl); -EXPORT_SYMBOL(port_info); -EXPORT_SYMBOL(br_avl_find_addr); +#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) +EXPORT_SYMBOL(br_handle_frame_hook); +EXPORT_SYMBOL(br_ioctl_hook); #endif #ifdef CONFIG_INET @@ -540,6 +536,7 @@ EXPORT_SYMBOL(unregister_hipdev); #ifdef CONFIG_SYSCTL EXPORT_SYMBOL(sysctl_wmem_max); EXPORT_SYMBOL(sysctl_rmem_max); +EXPORT_SYMBOL(sysctl_ip_default_ttl); #endif #if defined(CONFIG_ATALK) || defined(CONFIG_ATALK_MODULE) @@ -596,6 +593,7 @@ EXPORT_SYMBOL(nf_hooks); EXPORT_SYMBOL(register_gifconf); +EXPORT_SYMBOL(net_call_rx_atomic); EXPORT_SYMBOL(softirq_state); EXPORT_SYMBOL(softnet_data); |