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

[~andy/linux] / include / linux / phonet.h

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index 76edadf046d3d3b68215c23ef2a30ce18a86992a..26c8df7869180d4b94e4daf8b6c3b8988f7070ba 100644 (file)
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -36,6 +36,9 @@
 /* Socket options for SOL_PNPIPE level */
 #define PNPIPE_ENCAP           1
 #define PNPIPE_IFINDEX         2
+#define PNPIPE_PIPE_HANDLE     3
+#define PNPIPE_ENABLE           4
+/* unused slot */
 
 #define PNADDR_ANY             0
 #define PNADDR_BROADCAST       0xFC
@@ -47,6 +50,8 @@
 
 /* ioctls */
 #define SIOCPNGETOBJECT                (SIOCPROTOPRIVATE + 0)
+#define SIOCPNADDRESOURCE      (SIOCPROTOPRIVATE + 14)
+#define SIOCPNDELRESOURCE      (SIOCPROTOPRIVATE + 15)
 
 /* Phonet protocol header */
 struct phonethdr {