fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / udp.h

diff --git a/include/linux/udp.h b/include/linux/udp.h
index facf661..7e08c07 100644 (file)
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -20,10 +20,10 @@
 #include <linux/types.h>
 
 struct udphdr {
-       __u16   source;
-       __u16   dest;
-       __u16   len;
-       __u16   check;
+       __be16  source;
+       __be16  dest;
+       __be16  len;
+       __sum16 check;
 };
 
 /* UDP socket options */
@@ -35,36 +35,39 @@ struct udphdr {
 #define UDP_ENCAP_ESPINUDP     2 /* draft-ietf-ipsec-udp-encaps-06 */
 
 #ifdef __KERNEL__
+#include <linux/types.h>
 
-#include <linux/config.h>
-#include <net/sock.h>
-#include <linux/ip.h>
+#include <net/inet_sock.h>
+#define UDP_HTABLE_SIZE                128
 
-struct udp_opt {
-       int             pending;        /* Any pending frames ? */
-       unsigned int    corkflag;       /* Cork is required */
-       __u16           encap_type;     /* Is this an Encapsulation socket? */
+struct udp_sock {
+       /* inet_sock has to be the first member */
+       struct inet_sock inet;
+       int              pending;       /* Any pending frames ? */
+       unsigned int     corkflag;      /* Cork is required */
+       __u16            encap_type;    /* Is this an Encapsulation socket? */
        /*
-        * Following member retains the infomation to create a UDP header
+        * Following member retains the information to create a UDP header
         * when the socket is uncorked.
         */
-       __u16           len;            /* total length of pending frames */
-};
-
-/* WARNING: don't change the layout of the members in udp_sock! */
-struct udp_sock {
-       struct sock       sk;
-#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
-       struct ipv6_pinfo *pinet6;
-#endif
-       struct inet_opt   inet;
-       struct udp_opt    udp;
+       __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_opt * udp_sk(const struct sock *__sk)
+static inline struct udp_sock *udp_sk(const struct sock *sk)
 {
-       return &((struct udp_sock *)__sk)->udp;
+       return (struct udp_sock *)sk;
 }
+#define IS_UDPLITE(__sk) (udp_sk(__sk)->pcflag)
 
 #endif