Merge branch 'next' into for-linus

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

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index 3a027f588a4a5a3f6e0f88c54a8cbdd6833c6f07..c9609f9aedac6666ec0525f6c4b8d2fbd74a6fbb 100644 (file)
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -27,11 +27,21 @@
 #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)