2018-02-20 13:30:25

by Yafang Shao

Subject: [PATCH net-next] tcp: remove the hardcode in the definition of TCPF Macro

TCPF_ macro depends on the definition of TCP_ macro.
So it is better to define them with TCP_ marco.

Signed-off-by: Yafang Shao <[email protected]>
---
include/net/tcp_states.h | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/net/tcp_states.h b/include/net/tcp_states.h
index 50e78a7..2875e16 100644
--- a/include/net/tcp_states.h
+++ b/include/net/tcp_states.h
@@ -32,21 +32,21 @@ enum {

#define TCP_STATE_MASK 0xF

-#define TCP_ACTION_FIN (1 << 7)
+#define TCP_ACTION_FIN (1 << TCP_CLOSE)

enum {
- TCPF_ESTABLISHED = (1 << 1),
- TCPF_SYN_SENT = (1 << 2),
- TCPF_SYN_RECV = (1 << 3),
- TCPF_FIN_WAIT1 = (1 << 4),
- TCPF_FIN_WAIT2 = (1 << 5),
- TCPF_TIME_WAIT = (1 << 6),
- TCPF_CLOSE = (1 << 7),
- TCPF_CLOSE_WAIT = (1 << 8),
- TCPF_LAST_ACK = (1 << 9),
- TCPF_LISTEN = (1 << 10),
- TCPF_CLOSING = (1 << 11),
- TCPF_NEW_SYN_RECV = (1 << 12),
+ TCPF_ESTABLISHED = (1 << TCP_ESTABLISHED),
+ TCPF_SYN_SENT = (1 << TCP_SYN_SENT),
+ TCPF_SYN_RECV = (1 << TCP_SYN_RECV),
+ TCPF_FIN_WAIT1 = (1 << TCP_FIN_WAIT1),
+ TCPF_FIN_WAIT2 = (1 << TCP_FIN_WAIT2),
+ TCPF_TIME_WAIT = (1 << TCP_TIME_WAIT),
+ TCPF_CLOSE = (1 << TCP_CLOSE),
+ TCPF_CLOSE_WAIT = (1 << TCP_CLOSE_WAIT),
+ TCPF_LAST_ACK = (1 << TCP_LAST_ACK),
+ TCPF_LISTEN = (1 << TCP_LISTEN),
+ TCPF_CLOSING = (1 << TCP_CLOSING),
+ TCPF_NEW_SYN_RECV = (1 << TCP_NEW_SYN_RECV),
};

#endif /* _LINUX_TCP_STATES_H */
--
1.8.3.1

2018-02-21 19:16:18

by Eric Dumazet

Subject: Re: [PATCH net-next] tcp: remove the hardcode in the definition of TCPF Macro

On Tue, 2018-02-20 at 21:28 +0800, Yafang Shao wrote:
> TCPF_ macro depends on the definition of TCP_ macro.
> So it is better to define them with TCP_ marco.
>
> Signed-off-by: Yafang Shao <[email protected]>
> ---

Seems reasonable, thanks !

Reviewed-by: Eric Dumazet <[email protected]>

2018-02-21 20:08:25

by David Miller

Subject: Re: [PATCH net-next] tcp: remove the hardcode in the definition of TCPF Macro

From: Yafang Shao <[email protected]>
Date: Tue, 20 Feb 2018 21:28:31 +0800

> TCPF_ macro depends on the definition of TCP_ macro.
> So it is better to define them with TCP_ marco.
>
> Signed-off-by: Yafang Shao <[email protected]>

Applied, thank you.