2 files changed, 3 insertions, 4 deletions

diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index e27cbf931740..26c8df786918 100644
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -36,10 +36,9 @@
 /* Socket options for SOL_PNPIPE level */
 #define PNPIPE_ENCAP            1
 #define PNPIPE_IFINDEX          2
-#define PNPIPE_CREATE           3
+#define PNPIPE_PIPE_HANDLE      3
 #define PNPIPE_ENABLE           4
 /* unused slot */
-#define PNPIPE_DESTROY          6
 
 #define PNADDR_ANY              0
 #define PNADDR_BROADCAST        0xFC
diff --git a/include/net/phonet/pep.h b/include/net/phonet/pep.h
index def6cfa3f451..b60b28c99e87 100644
--- a/include/net/phonet/pep.h
+++ b/include/net/phonet/pep.h
@@ -46,8 +46,8 @@ struct pep_sock {
         u8                      init_enable;    /* auto-enable at creation */
         u8                      aligned;
 #ifdef CONFIG_PHONET_PIPECTRLR
-        u16                     remote_pep;
-        u8                      pipe_state;
+        u8                      pipe_state;
+        struct sockaddr_pn      remote_pep;
 #endif
 };