Commit 22712813 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[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: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d8313f5c

include/linux/tcp.h

+0 −16
Original line number Diff line number Diff line
@@ -55,22 +55,6 @@ struct tcphdr { 
	__u16	urg_ptr;

};



#define TCP_ACTION_FIN	(1 << 7)



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) 

};



/*

 *	The union cast uses a gcc extension to avoid aliasing problems

 *  (union is compatible to any of its members)

include/net/tcp_states.h

+16 −0
Original line number Diff line number Diff line
@@ -31,4 +31,20 @@ enum { 


#define TCP_STATE_MASK	0xF



#define TCP_ACTION_FIN	(1 << 7)



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) 

};



#endif	/* _LINUX_TCP_STATES_H */