1 files changed, 1 insertions, 22 deletions

diff --git a/include/net/phonet/pep.h b/include/net/phonet/pep.h
index b60b28c99e87..b669fe6dbc3b 100644
--- a/include/net/phonet/pep.h
+++ b/include/net/phonet/pep.h
@@ -28,7 +28,6 @@ struct pep_sock {
 
         /* XXX: union-ify listening vs connected stuff ? */
         /* Listening socket stuff: */
-        struct hlist_head       ackq;
         struct hlist_head       hlist;
 
         /* Connected socket stuff: */
@@ -45,10 +44,6 @@ struct pep_sock {
         u8                      tx_fc;  /* TX flow control */
         u8                      init_enable;    /* auto-enable at creation */
         u8                      aligned;
-#ifdef CONFIG_PHONET_PIPECTRLR
-        u8                      pipe_state;
-        struct sockaddr_pn      remote_pep;
-#endif
 };
 
 static inline struct pep_sock *pep_sk(struct sock *sk)
@@ -158,6 +153,7 @@ enum {
         PN_LEGACY_FLOW_CONTROL,
         PN_ONE_CREDIT_FLOW_CONTROL,
         PN_MULTI_CREDIT_FLOW_CONTROL,
+        PN_MAX_FLOW_CONTROL,
 };
 
 #define pn_flow_safe(fc) ((fc) >> 1)
@@ -169,21 +165,4 @@ enum {
         PEP_IND_READY,
 };
 
-#ifdef CONFIG_PHONET_PIPECTRLR
-#define PNS_PEP_CONNECT_UTID           0x02
-#define PNS_PIPE_CREATED_IND_UTID      0x04
-#define PNS_PIPE_ENABLE_UTID           0x0A
-#define PNS_PIPE_ENABLED_IND_UTID      0x0C
-#define PNS_PIPE_DISABLE_UTID          0x0F
-#define PNS_PIPE_DISABLED_IND_UTID     0x11
-#define PNS_PEP_DISCONNECT_UTID        0x06
-
-/* Used for tracking state of a pipe */
-enum {
-        PIPE_IDLE,
-        PIPE_DISABLED,
-        PIPE_ENABLED,
-};
-#endif /* CONFIG_PHONET_PIPECTRLR */
-
 #endif