1 files changed, 7 insertions, 2 deletions

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index 24426c3d6b5a..26c8df786918 100644
--- 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 {
@@ -56,7 +61,7 @@ struct phonethdr {
         __be16  pn_length;
         __u8    pn_robj;
         __u8    pn_sobj;
-} __packed;
+} __attribute__((packed));
 
 /* Common Phonet payload header */
 struct phonetmsg {
@@ -98,7 +103,7 @@ struct sockaddr_pn {
         __u8 spn_dev;
         __u8 spn_resource;
         __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3];
-} __packed;
+} __attribute__((packed));
 
 /* Well known address */
 #define PN_DEV_PC       0x10