USB: ipaq.c: Additional devices

[linux-2.6-omap-h63xx.git] / include / net / udp.h

diff --git a/include/net/udp.h b/include/net/udp.h
index 39e825a6909a59c988544f5ca050cb586441423e..1b921fa814742a6ed499e2ae11d9f3a14bfe6ed1 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -29,6 +29,7 @@
 #include <net/ip.h>
 #include <linux/ipv6.h>
 #include <linux/seq_file.h>
+#include <linux/poll.h>
 
 /**
  *     struct udp_skb_cb  -  UDP(-Lite) private variables
@@ -69,15 +70,15 @@ struct sk_buff;
 /*
  *     Generic checksumming routines for UDP(-Lite) v4 and v6
  */
-static inline u16  __udp_lib_checksum_complete(struct sk_buff *skb)
+static inline __sum16 __udp_lib_checksum_complete(struct sk_buff *skb)
 {
        if (! UDP_SKB_CB(skb)->partial_cov)
                return __skb_checksum_complete(skb);
-       return  csum_fold(skb_checksum(skb, 0, UDP_SKB_CB(skb)->cscov,
-                         skb->csum));
+       return csum_fold(skb_checksum(skb, 0, UDP_SKB_CB(skb)->cscov,
+                                     skb->csum));
 }
 
-static __inline__ int udp_lib_checksum_complete(struct sk_buff *skb)
+static inline int udp_lib_checksum_complete(struct sk_buff *skb)
 {
        return skb->ip_summed != CHECKSUM_UNNECESSARY &&
                __udp_lib_checksum_complete(skb);
@@ -134,6 +135,11 @@ extern int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int     udp_disconnect(struct sock *sk, int flags);
 extern unsigned int udp_poll(struct file *file, struct socket *sock,
                             poll_table *wait);
+extern int     udp_lib_getsockopt(struct sock *sk, int level, int optname,
+                                  char __user *optval, int __user *optlen);
+extern int     udp_lib_setsockopt(struct sock *sk, int level, int optname,
+                                  char __user *optval, int optlen,
+                                  int (*push_pending_frames)(struct sock *));
 
 DECLARE_SNMP_STAT(struct udp_mib, udp_statistics);
 /*