Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[TCP]: Move the TCPF_ enum to tcp_states.h

Upcoming patches will make, for instance, ip_sockglue.c need just this enum
and not all of tcp.h.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Arnaldo Carvalho de Melo and committed by
David S. Miller
22712813 d8313f5c

+16 -16
-16
include/linux/tcp.h
··· 55 55 __u16 urg_ptr; 56 56 }; 57 57 58 - #define TCP_ACTION_FIN (1 << 7) 59 - 60 - enum { 61 - TCPF_ESTABLISHED = (1 << 1), 62 - TCPF_SYN_SENT = (1 << 2), 63 - TCPF_SYN_RECV = (1 << 3), 64 - TCPF_FIN_WAIT1 = (1 << 4), 65 - TCPF_FIN_WAIT2 = (1 << 5), 66 - TCPF_TIME_WAIT = (1 << 6), 67 - TCPF_CLOSE = (1 << 7), 68 - TCPF_CLOSE_WAIT = (1 << 8), 69 - TCPF_LAST_ACK = (1 << 9), 70 - TCPF_LISTEN = (1 << 10), 71 - TCPF_CLOSING = (1 << 11) 72 - }; 73 - 74 58 /* 75 59 * The union cast uses a gcc extension to avoid aliasing problems 76 60 * (union is compatible to any of its members)
+16
include/net/tcp_states.h
··· 31 31 32 32 #define TCP_STATE_MASK 0xF 33 33 34 + #define TCP_ACTION_FIN (1 << 7) 35 + 36 + enum { 37 + TCPF_ESTABLISHED = (1 << 1), 38 + TCPF_SYN_SENT = (1 << 2), 39 + TCPF_SYN_RECV = (1 << 3), 40 + TCPF_FIN_WAIT1 = (1 << 4), 41 + TCPF_FIN_WAIT2 = (1 << 5), 42 + TCPF_TIME_WAIT = (1 << 6), 43 + TCPF_CLOSE = (1 << 7), 44 + TCPF_CLOSE_WAIT = (1 << 8), 45 + TCPF_LAST_ACK = (1 << 9), 46 + TCPF_LISTEN = (1 << 10), 47 + TCPF_CLOSING = (1 << 11) 48 + }; 49 + 34 50 #endif /* _LINUX_TCP_STATES_H */