diff options
author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2011-02-24 18:14:59 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-25 14:19:36 -0500 |
commit | 2feb61816f7f0be57f4bc61137555e9a8cb4f322 (patch) | |
tree | ed5a4b75bdc8ebb51bfecf25e96a5555583d8949 /include/net/phonet | |
parent | 14ba8faebcc241e4d60a4ef4a7d3fdef1c2e846f (diff) |
Phonet: remove redumdant pep->pipe_state
sk->sk_state already contains the pipe state.
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/phonet')
-rw-r--r-- | include/net/phonet/pep.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/net/phonet/pep.h b/include/net/phonet/pep.h index 788ccf353582..4c48ed80bc07 100644 --- a/include/net/phonet/pep.h +++ b/include/net/phonet/pep.h | |||
@@ -45,9 +45,6 @@ struct pep_sock { | |||
45 | u8 tx_fc; /* TX flow control */ | 45 | u8 tx_fc; /* TX flow control */ |
46 | u8 init_enable; /* auto-enable at creation */ | 46 | u8 init_enable; /* auto-enable at creation */ |
47 | u8 aligned; | 47 | u8 aligned; |
48 | #ifdef CONFIG_PHONET_PIPECTRLR | ||
49 | u8 pipe_state; | ||
50 | #endif | ||
51 | }; | 48 | }; |
52 | 49 | ||
53 | static inline struct pep_sock *pep_sk(struct sock *sk) | 50 | static inline struct pep_sock *pep_sk(struct sock *sk) |
@@ -177,12 +174,6 @@ enum { | |||
177 | #define PNS_PIPE_DISABLED_IND_UTID 0x11 | 174 | #define PNS_PIPE_DISABLED_IND_UTID 0x11 |
178 | #define PNS_PEP_DISCONNECT_UTID 0x06 | 175 | #define PNS_PEP_DISCONNECT_UTID 0x06 |
179 | 176 | ||
180 | /* Used for tracking state of a pipe */ | ||
181 | enum { | ||
182 | PIPE_IDLE, | ||
183 | PIPE_DISABLED, | ||
184 | PIPE_ENABLED, | ||
185 | }; | ||
186 | #endif /* CONFIG_PHONET_PIPECTRLR */ | 177 | #endif /* CONFIG_PHONET_PIPECTRLR */ |
187 | 178 | ||
188 | #endif | 179 | #endif |