nfsd4: fix null dereference creating nfsv4 callback client

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

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index 3a027f5..ee5e3c9 100644 (file)
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -23,15 +23,27 @@
 #ifndef LINUX_PHONET_H
 #define LINUX_PHONET_H
 
+#include <linux/types.h>
+
 /* Automatic protocol selection */
 #define PN_PROTO_TRANSPORT     0
 /* Phonet datagram socket */
 #define PN_PROTO_PHONET                1
-#define PHONET_NPROTO          2
+/* Phonet pipe */
+#define PN_PROTO_PIPE          2
+#define PHONET_NPROTO          3
+
+/* Socket options for SOL_PNPIPE level */
+#define PNPIPE_ENCAP           1
+#define PNPIPE_IFINDEX         2
 
 #define PNADDR_ANY             0
 #define PNPORT_RESOURCE_ROUTING        0
 
+/* Values for PNPIPE_ENCAP option */
+#define PNPIPE_ENCAP_NONE      0
+#define PNPIPE_ENCAP_IP                1
+
 /* ioctls */
 #define SIOCPNGETOBJECT                (SIOCPROTOPRIVATE + 0)
 
@@ -62,6 +74,7 @@ struct phonetmsg {
        } pn_msg_u;
 };
 #define PN_COMMON_MESSAGE      0xF0
+#define PN_COMMGR              0x10
 #define PN_PREFIX              0xE0 /* resource for extended messages */
 #define pn_submsg_id           pn_msg_u.base.pn_submsg_id
 #define pn_e_submsg_id         pn_msg_u.ext.pn_e_submsg_id