Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / include / linux / udp.h

diff --git a/include/linux/udp.h b/include/linux/udp.h
index 90223f0..6de445c 100644 (file)
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -20,12 +20,21 @@
 #include <linux/types.h>
 
 struct udphdr {
-       __u16   source;
-       __u16   dest;
-       __u16   len;
-       __u16   check;
+       __be16  source;
+       __be16  dest;
+       __be16  len;
+       __sum16 check;
 };
 
+#ifdef __KERNEL__
+#include <linux/skbuff.h>
+
+static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
+{
+       return (struct udphdr *)skb_transport_header(skb);
+}
+#endif
+
 /* UDP socket options */
 #define UDP_CORK       1       /* Never send partially complete segments */
 #define UDP_ENCAP      100     /* Set the socket to accept encapsulated packets */
@@ -38,6 +47,7 @@ struct udphdr {
 #include <linux/types.h>
 
 #include <net/inet_sock.h>
+#define UDP_HTABLE_SIZE                128
 
 struct udp_sock {
        /* inet_sock has to be the first member */
@@ -50,12 +60,23 @@ struct udp_sock {
         * when the socket is uncorked.
         */
        __u16            len;           /* total length of pending frames */
+       /*
+        * Fields specific to UDP-Lite.
+        */
+       __u16            pcslen;
+       __u16            pcrlen;
+/* indicator bits used by pcflag: */
+#define UDPLITE_BIT      0x1           /* set by udplite proto init function */
+#define UDPLITE_SEND_CC  0x2           /* set via udplite setsockopt         */
+#define UDPLITE_RECV_CC  0x4           /* set via udplite setsocktopt        */
+       __u8             pcflag;        /* marks socket as UDP-Lite if > 0    */
 };
 
 static inline struct udp_sock *udp_sk(const struct sock *sk)
 {
        return (struct udp_sock *)sk;
 }
+#define IS_UDPLITE(__sk) (udp_sk(__sk)->pcflag)
 
 #endif