nfsd4: fix null dereference creating nfsv4 callback client

[safe/jmp/linux-2.6] / include / linux / udp.h

diff --git a/include/linux/udp.h b/include/linux/udp.h
index 7e08c07..0cf5c4c 100644 (file)
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
@@ -33,13 +33,25 @@ struct udphdr {
 /* UDP encapsulation types */
 #define UDP_ENCAP_ESPINUDP_NON_IKE     1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
 #define UDP_ENCAP_ESPINUDP     2 /* draft-ietf-ipsec-udp-encaps-06 */
+#define UDP_ENCAP_L2TPINUDP    3 /* rfc2661 */
 
 #ifdef __KERNEL__
-#include <linux/types.h>
-
 #include <net/inet_sock.h>
+#include <linux/skbuff.h>
+#include <net/netns/hash.h>
+
+static inline struct udphdr *udp_hdr(const struct sk_buff *skb)
+{
+       return (struct udphdr *)skb_transport_header(skb);
+}
+
 #define UDP_HTABLE_SIZE                128
 
+static inline int udp_hashfn(struct net *net, const unsigned num)
+{
+       return (num + net_hash_mix(net)) & (UDP_HTABLE_SIZE - 1);
+}
+
 struct udp_sock {
        /* inet_sock has to be the first member */
        struct inet_sock inet;
@@ -61,12 +73,18 @@ struct udp_sock {
 #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    */
+       __u8             unused[3];
+       /*
+        * For encapsulation sockets.
+        */
+       int (*encap_rcv)(struct sock *sk, struct sk_buff *skb);
 };
 
 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