Import of Linux/MIPS 2.1.36

1 files changed, 12 insertions, 12 deletions

diff --git a/include/net/udp.h b/include/net/udp.h
index d834feb6d..0fa99fb1c 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -24,6 +24,15 @@
 
 #include <linux/udp.h>
 
+#define UDP_HTABLE_SIZE		128
+
+/* udp.c: This needs to be shared by v4 and v6 because the lookup
+ *        and hashing code needs to work with different AF's yet
+ *        the port space is shared.
+ */
+extern struct sock *udp_hash[UDP_HTABLE_SIZE];
+
+extern unsigned short udp_good_socknum(void);
 
 #define UDP_NO_CHECK	0
 
@@ -31,23 +40,14 @@
 extern struct proto udp_prot;
 
 
-extern void	udp_err(int type, int code, unsigned char *header,
-			__u32 info, __u32 daddr, __u32 saddr,
-			struct inet_protocol *protocol, int len);
-extern void	udp_send_check(struct udphdr *uh, __u32 saddr, 
-			__u32 daddr, int len, struct sock *sk);
+extern void	udp_err(struct sk_buff *, unsigned char *);
 extern int	udp_connect(struct sock *sk,
 			    struct sockaddr *usin, int addr_len);
 
-extern int	udp_sendmsg(struct sock *sk, struct msghdr *msg,
-			    int len, int noblock, int flags);
+extern int	udp_sendmsg(struct sock *sk, struct msghdr *msg, int len);
 
-extern int	udp_rcv(struct sk_buff *skb, struct device *dev,
-			struct options *opt, __u32 daddr,
-			unsigned short len, __u32 saddr, int redo,
-			struct inet_protocol *protocol);
+extern int	udp_rcv(struct sk_buff *skb, unsigned short len);
 extern int	udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
-extern void	udp_cache_zap(void);	/* Remove udp last socket cache */
 
 /* CONFIG_IP_TRANSPARENT_PROXY */
 extern int	udp_chkaddr(struct sk_buff *skb);