diff options
Diffstat (limited to 'net/ipx/af_ipx.c')
-rw-r--r-- | net/ipx/af_ipx.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 994e28bfb32e..00b2a6d1c009 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c | |||
@@ -52,18 +52,12 @@ | |||
52 | #include <net/p8022.h> | 52 | #include <net/p8022.h> |
53 | #include <net/psnap.h> | 53 | #include <net/psnap.h> |
54 | #include <net/sock.h> | 54 | #include <net/sock.h> |
55 | #include <net/datalink.h> | ||
55 | #include <net/tcp_states.h> | 56 | #include <net/tcp_states.h> |
57 | #include <net/net_namespace.h> | ||
56 | 58 | ||
57 | #include <asm/uaccess.h> | 59 | #include <asm/uaccess.h> |
58 | 60 | ||
59 | #ifdef CONFIG_SYSCTL | ||
60 | extern void ipx_register_sysctl(void); | ||
61 | extern void ipx_unregister_sysctl(void); | ||
62 | #else | ||
63 | #define ipx_register_sysctl() | ||
64 | #define ipx_unregister_sysctl() | ||
65 | #endif | ||
66 | |||
67 | /* Configuration Variables */ | 61 | /* Configuration Variables */ |
68 | static unsigned char ipxcfg_max_hops = 16; | 62 | static unsigned char ipxcfg_max_hops = 16; |
69 | static char ipxcfg_auto_select_primary; | 63 | static char ipxcfg_auto_select_primary; |
@@ -84,15 +78,6 @@ DEFINE_SPINLOCK(ipx_interfaces_lock); | |||
84 | struct ipx_interface *ipx_primary_net; | 78 | struct ipx_interface *ipx_primary_net; |
85 | struct ipx_interface *ipx_internal_net; | 79 | struct ipx_interface *ipx_internal_net; |
86 | 80 | ||
87 | extern int ipxrtr_add_route(__be32 network, struct ipx_interface *intrfc, | ||
88 | unsigned char *node); | ||
89 | extern void ipxrtr_del_routes(struct ipx_interface *intrfc); | ||
90 | extern int ipxrtr_route_packet(struct sock *sk, struct sockaddr_ipx *usipx, | ||
91 | struct iovec *iov, size_t len, int noblock); | ||
92 | extern int ipxrtr_route_skb(struct sk_buff *skb); | ||
93 | extern struct ipx_route *ipxrtr_lookup(__be32 net); | ||
94 | extern int ipxrtr_ioctl(unsigned int cmd, void __user *arg); | ||
95 | |||
96 | struct ipx_interface *ipx_interfaces_head(void) | 81 | struct ipx_interface *ipx_interfaces_head(void) |
97 | { | 82 | { |
98 | struct ipx_interface *rc = NULL; | 83 | struct ipx_interface *rc = NULL; |
@@ -1986,9 +1971,6 @@ static struct notifier_block ipx_dev_notifier = { | |||
1986 | .notifier_call = ipxitf_device_event, | 1971 | .notifier_call = ipxitf_device_event, |
1987 | }; | 1972 | }; |
1988 | 1973 | ||
1989 | extern struct datalink_proto *make_EII_client(void); | ||
1990 | extern void destroy_EII_client(struct datalink_proto *); | ||
1991 | |||
1992 | static const unsigned char ipx_8022_type = 0xE0; | 1974 | static const unsigned char ipx_8022_type = 0xE0; |
1993 | static const unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 }; | 1975 | static const unsigned char ipx_snap_id[5] = { 0x0, 0x0, 0x0, 0x81, 0x37 }; |
1994 | static const char ipx_EII_err_msg[] __initconst = | 1976 | static const char ipx_EII_err_msg[] __initconst = |