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

[TCP]: Move the tcp sock states to net/tcp_states.h

Lots of places just needs the states, not even linux/tcp.h, where this
enum was, needs it.

This speeds up development of the refactorings as less sources are
rebuilt when things get moved from net/tcp.h.

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

authored by

Arnaldo Carvalho de Melo and committed by
David S. Miller c752f073 f3f05f70

+86 -66
+1 -1
fs/smbfs/sock.c
··· 15 15 #include <linux/file.h> 16 16 #include <linux/in.h> 17 17 #include <linux/net.h> 18 - #include <linux/tcp.h> 19 18 #include <linux/mm.h> 20 19 #include <linux/netdevice.h> 21 20 #include <linux/smp_lock.h> 22 21 #include <linux/workqueue.h> 23 22 #include <net/scm.h> 23 + #include <net/tcp_states.h> 24 24 #include <net/ip.h> 25 25 26 26 #include <linux/smb_fs.h>
-18
include/linux/tcp.h
··· 55 55 __u16 urg_ptr; 56 56 }; 57 57 58 - 59 - enum { 60 - TCP_ESTABLISHED = 1, 61 - TCP_SYN_SENT, 62 - TCP_SYN_RECV, 63 - TCP_FIN_WAIT1, 64 - TCP_FIN_WAIT2, 65 - TCP_TIME_WAIT, 66 - TCP_CLOSE, 67 - TCP_CLOSE_WAIT, 68 - TCP_LAST_ACK, 69 - TCP_LISTEN, 70 - TCP_CLOSING, /* now a valid state */ 71 - 72 - TCP_MAX_STATES /* Leave at the end! */ 73 - }; 74 - 75 - #define TCP_STATE_MASK 0xF 76 58 #define TCP_ACTION_FIN (1 << 7) 77 59 78 60 enum {
+1
include/net/dn.h
··· 3 3 4 4 #include <linux/dn.h> 5 5 #include <net/sock.h> 6 + #include <net/tcp.h> 6 7 #include <asm/byteorder.h> 7 8 8 9 typedef unsigned short dn_address;
+1 -1
include/net/inet_hashtables.h
··· 19 19 #include <linux/list.h> 20 20 #include <linux/slab.h> 21 21 #include <linux/spinlock.h> 22 - #include <linux/tcp.h> /* only for TCP_LISTEN, damn :-( */ 23 22 #include <linux/types.h> 24 23 #include <linux/wait.h> 25 24 26 25 #include <net/sock.h> 26 + #include <net/tcp_states.h> 27 27 28 28 #include <asm/atomic.h> 29 29
-1
include/net/ip6_route.h
··· 12 12 #include <net/flow.h> 13 13 #include <net/ip6_fib.h> 14 14 #include <net/sock.h> 15 - #include <linux/tcp.h> 16 15 #include <linux/ip.h> 17 16 #include <linux/ipv6.h> 18 17
-1
include/net/ip_vs.h
··· 255 255 #include <asm/atomic.h> /* for struct atomic_t */ 256 256 #include <linux/netdevice.h> /* for struct neighbour */ 257 257 #include <net/dst.h> /* for struct dst_entry */ 258 - #include <net/tcp.h> 259 258 #include <net/udp.h> 260 259 #include <linux/compiler.h> 261 260
+1 -1
include/net/sctp/constants.h
··· 47 47 #ifndef __sctp_constants_h__ 48 48 #define __sctp_constants_h__ 49 49 50 - #include <linux/tcp.h> /* For TCP states used in sctp_sock_state_t */ 51 50 #include <linux/sctp.h> 52 51 #include <linux/ipv6.h> /* For ipv6hdr. */ 53 52 #include <net/sctp/user.h> 53 + #include <net/tcp_states.h> /* For TCP states used in sctp_sock_state_t */ 54 54 55 55 /* Value used for stream negotiation. */ 56 56 enum { SCTP_MAX_STREAM = 0xffff };
+2
include/net/tcp.h
··· 36 36 #include <net/sock.h> 37 37 #include <net/snmp.h> 38 38 #include <net/ip.h> 39 + #include <net/tcp_states.h> 40 + 39 41 #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) 40 42 #include <linux/ipv6.h> 41 43 #endif
+34
include/net/tcp_states.h
··· 1 + /* 2 + * INET An implementation of the TCP/IP protocol suite for the LINUX 3 + * operating system. INET is implemented using the BSD Socket 4 + * interface as the means of communication with the user level. 5 + * 6 + * Definitions for the TCP protocol sk_state field. 7 + * 8 + * This program is free software; you can redistribute it and/or 9 + * modify it under the terms of the GNU General Public License 10 + * as published by the Free Software Foundation; either version 11 + * 2 of the License, or (at your option) any later version. 12 + */ 13 + #ifndef _LINUX_TCP_STATES_H 14 + #define _LINUX_TCP_STATES_H 15 + 16 + enum { 17 + TCP_ESTABLISHED = 1, 18 + TCP_SYN_SENT, 19 + TCP_SYN_RECV, 20 + TCP_FIN_WAIT1, 21 + TCP_FIN_WAIT2, 22 + TCP_TIME_WAIT, 23 + TCP_CLOSE, 24 + TCP_CLOSE_WAIT, 25 + TCP_LAST_ACK, 26 + TCP_LISTEN, 27 + TCP_CLOSING, /* Now a valid state */ 28 + 29 + TCP_MAX_STATES /* Leave at the end! */ 30 + }; 31 + 32 + #define TCP_STATE_MASK 0xF 33 + 34 + #endif /* _LINUX_TCP_STATES_H */
+1 -1
net/appletalk/ddp.c
··· 53 53 54 54 #include <linux/config.h> 55 55 #include <linux/module.h> 56 - #include <linux/tcp.h> 57 56 #include <linux/if_arp.h> 58 57 #include <linux/termios.h> /* For TIOCOUTQ/INQ */ 59 58 #include <net/datalink.h> 60 59 #include <net/psnap.h> 61 60 #include <net/sock.h> 61 + #include <net/tcp_states.h> 62 62 #include <net/route.h> 63 63 #include <linux/atalk.h> 64 64
+1 -1
net/ax25/af_ax25.c
··· 45 45 #include <linux/sysctl.h> 46 46 #include <linux/init.h> 47 47 #include <linux/spinlock.h> 48 - #include <net/tcp.h> 48 + #include <net/tcp_states.h> 49 49 #include <net/ip.h> 50 50 #include <net/arp.h> 51 51
+1 -1
net/ax25/ax25_ds_in.c
··· 23 23 #include <linux/skbuff.h> 24 24 #include <net/sock.h> 25 25 #include <net/ip.h> /* For ip_rcv */ 26 - #include <net/tcp.h> 26 + #include <net/tcp_states.h> 27 27 #include <asm/uaccess.h> 28 28 #include <asm/system.h> 29 29 #include <linux/fcntl.h>
+1 -1
net/ax25/ax25_ds_timer.c
··· 18 18 #include <linux/string.h> 19 19 #include <linux/sockios.h> 20 20 #include <linux/net.h> 21 - #include <net/tcp.h> 21 + #include <net/tcp_states.h> 22 22 #include <net/ax25.h> 23 23 #include <linux/inet.h> 24 24 #include <linux/netdevice.h>
+1 -1
net/ax25/ax25_in.c
··· 27 27 #include <linux/netfilter.h> 28 28 #include <net/sock.h> 29 29 #include <net/ip.h> /* For ip_rcv */ 30 - #include <net/tcp.h> 30 + #include <net/tcp_states.h> 31 31 #include <net/arp.h> /* For arp_rcv */ 32 32 #include <asm/uaccess.h> 33 33 #include <asm/system.h>
+1 -1
net/ax25/ax25_std_in.c
··· 30 30 #include <linux/skbuff.h> 31 31 #include <net/sock.h> 32 32 #include <net/ip.h> /* For ip_rcv */ 33 - #include <net/tcp.h> 33 + #include <net/tcp_states.h> 34 34 #include <asm/uaccess.h> 35 35 #include <asm/system.h> 36 36 #include <linux/fcntl.h>
+1 -1
net/ax25/ax25_std_timer.c
··· 24 24 #include <linux/netdevice.h> 25 25 #include <linux/skbuff.h> 26 26 #include <net/sock.h> 27 - #include <net/tcp.h> 27 + #include <net/tcp_states.h> 28 28 #include <asm/uaccess.h> 29 29 #include <asm/system.h> 30 30 #include <linux/fcntl.h>
+1 -1
net/ax25/ax25_subr.c
··· 24 24 #include <linux/netdevice.h> 25 25 #include <linux/skbuff.h> 26 26 #include <net/sock.h> 27 - #include <net/tcp.h> 27 + #include <net/tcp_states.h> 28 28 #include <asm/uaccess.h> 29 29 #include <asm/system.h> 30 30 #include <linux/fcntl.h>
+3 -3
net/core/datagram.c
··· 43 43 #include <linux/errno.h> 44 44 #include <linux/sched.h> 45 45 #include <linux/inet.h> 46 - #include <linux/tcp.h> 47 46 #include <linux/netdevice.h> 48 47 #include <linux/rtnetlink.h> 49 48 #include <linux/poll.h> ··· 50 51 51 52 #include <net/protocol.h> 52 53 #include <linux/skbuff.h> 53 - #include <net/sock.h> 54 - #include <net/checksum.h> 55 54 55 + #include <net/checksum.h> 56 + #include <net/sock.h> 57 + #include <net/tcp_states.h> 56 58 57 59 /* 58 60 * Is a socket 'connection oriented' ?
+1 -1
net/decnet/af_decnet.c
··· 118 118 #include <linux/netfilter.h> 119 119 #include <linux/seq_file.h> 120 120 #include <net/sock.h> 121 - #include <net/tcp.h> 121 + #include <net/tcp_states.h> 122 122 #include <net/flow.h> 123 123 #include <asm/system.h> 124 124 #include <asm/ioctls.h>
+1 -1
net/decnet/dn_nsp_in.c
··· 60 60 #include <linux/inet.h> 61 61 #include <linux/route.h> 62 62 #include <net/sock.h> 63 - #include <net/tcp.h> 63 + #include <net/tcp_states.h> 64 64 #include <asm/system.h> 65 65 #include <linux/fcntl.h> 66 66 #include <linux/mm.h>
+1 -1
net/ipv4/datagram.c
··· 17 17 #include <linux/ip.h> 18 18 #include <linux/in.h> 19 19 #include <net/sock.h> 20 - #include <net/tcp.h> 21 20 #include <net/route.h> 21 + #include <net/tcp_states.h> 22 22 23 23 int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 24 24 {
+1
net/ipv4/ipvs/ip_vs_app.c
··· 26 26 #include <linux/in.h> 27 27 #include <linux/ip.h> 28 28 #include <net/protocol.h> 29 + #include <net/tcp.h> 29 30 #include <asm/system.h> 30 31 #include <linux/stat.h> 31 32 #include <linux/proc_fs.h>
-1
net/ipv4/protocol.c
··· 40 40 #include <linux/timer.h> 41 41 #include <net/ip.h> 42 42 #include <net/protocol.h> 43 - #include <net/tcp.h> 44 43 #include <linux/skbuff.h> 45 44 #include <net/sock.h> 46 45 #include <net/icmp.h>
+1 -1
net/ipv4/raw.c
··· 59 59 #include <linux/netdevice.h> 60 60 #include <linux/in_route.h> 61 61 #include <linux/route.h> 62 - #include <linux/tcp.h> 63 62 #include <linux/skbuff.h> 64 63 #include <net/dst.h> 65 64 #include <net/sock.h> ··· 70 71 #include <net/udp.h> 71 72 #include <net/raw.h> 72 73 #include <net/snmp.h> 74 + #include <net/tcp_states.h> 73 75 #include <net/inet_common.h> 74 76 #include <net/checksum.h> 75 77 #include <net/xfrm.h>
+2 -1
net/ipv4/udp.c
··· 95 95 #include <linux/ipv6.h> 96 96 #include <linux/netdevice.h> 97 97 #include <net/snmp.h> 98 - #include <net/tcp.h> 98 + #include <net/ip.h> 99 + #include <net/tcp_states.h> 99 100 #include <net/protocol.h> 100 101 #include <linux/skbuff.h> 101 102 #include <linux/proc_fs.h>
+1
net/ipv6/datagram.c
··· 29 29 #include <net/addrconf.h> 30 30 #include <net/transp_v6.h> 31 31 #include <net/ip6_route.h> 32 + #include <net/tcp_states.h> 32 33 33 34 #include <linux/errqueue.h> 34 35 #include <asm/uaccess.h>
+1
net/ipv6/raw.c
··· 49 49 #include <net/transp_v6.h> 50 50 #include <net/udp.h> 51 51 #include <net/inet_common.h> 52 + #include <net/tcp_states.h> 52 53 53 54 #include <net/rawv6.h> 54 55 #include <net/xfrm.h>
+1
net/ipv6/udp.c
··· 51 51 #include <net/udp.h> 52 52 #include <net/raw.h> 53 53 #include <net/inet_common.h> 54 + #include <net/tcp_states.h> 54 55 55 56 #include <net/ip6_checksum.h> 56 57 #include <net/xfrm.h>
+1 -1
net/ipx/af_ipx.c
··· 44 44 #include <linux/socket.h> 45 45 #include <linux/sockios.h> 46 46 #include <linux/string.h> 47 - #include <linux/tcp.h> 48 47 #include <linux/types.h> 49 48 #include <linux/termios.h> 50 49 ··· 51 52 #include <net/p8022.h> 52 53 #include <net/psnap.h> 53 54 #include <net/sock.h> 55 + #include <net/tcp_states.h> 54 56 55 57 #include <asm/uaccess.h> 56 58
+1 -1
net/ipx/ipx_proc.c
··· 10 10 #include <linux/proc_fs.h> 11 11 #include <linux/spinlock.h> 12 12 #include <linux/seq_file.h> 13 - #include <linux/tcp.h> 13 + #include <net/tcp_states.h> 14 14 #include <net/ipx.h> 15 15 16 16 static __inline__ struct ipx_interface *ipx_get_interface_idx(loff_t pos)
+1 -1
net/irda/af_irda.c
··· 56 56 #include <asm/uaccess.h> 57 57 58 58 #include <net/sock.h> 59 - #include <net/tcp.h> 59 + #include <net/tcp_states.h> 60 60 61 61 #include <net/irda/af_irda.h> 62 62
+1 -1
net/llc/af_llc.c
··· 23 23 #include <linux/config.h> 24 24 #include <linux/kernel.h> 25 25 #include <linux/module.h> 26 - #include <linux/tcp.h> 27 26 #include <linux/rtnetlink.h> 28 27 #include <linux/init.h> 29 28 #include <net/llc.h> 30 29 #include <net/llc_sap.h> 31 30 #include <net/llc_pdu.h> 32 31 #include <net/llc_conn.h> 32 + #include <net/tcp_states.h> 33 33 34 34 /* remember: uninitialized global data is zeroed because its in .bss */ 35 35 static u16 llc_ui_sap_last_autoport = LLC_SAP_DYN_START;
+1 -1
net/llc/llc_conn.c
··· 16 16 #include <net/llc_sap.h> 17 17 #include <net/llc_conn.h> 18 18 #include <net/sock.h> 19 - #include <linux/tcp.h> 19 + #include <net/tcp_states.h> 20 20 #include <net/llc_c_ev.h> 21 21 #include <net/llc_c_ac.h> 22 22 #include <net/llc_c_st.h>
+1 -1
net/llc/llc_if.c
··· 15 15 #include <linux/module.h> 16 16 #include <linux/kernel.h> 17 17 #include <linux/netdevice.h> 18 - #include <linux/tcp.h> 19 18 #include <asm/errno.h> 20 19 #include <net/llc_if.h> 21 20 #include <net/llc_sap.h> ··· 24 25 #include <net/llc_c_ev.h> 25 26 #include <net/llc_c_ac.h> 26 27 #include <net/llc_c_st.h> 28 + #include <net/tcp_states.h> 27 29 28 30 u8 llc_mac_null_var[IFHWADDRLEN]; 29 31
+1 -1
net/llc/llc_sap.c
··· 21 21 #include <net/llc_s_ev.h> 22 22 #include <net/llc_s_st.h> 23 23 #include <net/sock.h> 24 - #include <linux/tcp.h> 24 + #include <net/tcp_states.h> 25 25 #include <linux/llc.h> 26 26 27 27 /**
+1 -1
net/netrom/af_netrom.c
··· 39 39 #include <linux/proc_fs.h> 40 40 #include <linux/seq_file.h> 41 41 #include <net/ip.h> 42 - #include <net/tcp.h> 42 + #include <net/tcp_states.h> 43 43 #include <net/arp.h> 44 44 #include <linux/init.h> 45 45
+1 -1
net/netrom/nr_in.c
··· 22 22 #include <linux/netdevice.h> 23 23 #include <linux/skbuff.h> 24 24 #include <net/sock.h> 25 - #include <net/tcp.h> 25 + #include <net/tcp_states.h> 26 26 #include <net/ip.h> /* For ip_rcv */ 27 27 #include <asm/uaccess.h> 28 28 #include <asm/system.h>
+1 -1
net/netrom/nr_subr.c
··· 21 21 #include <linux/netdevice.h> 22 22 #include <linux/skbuff.h> 23 23 #include <net/sock.h> 24 - #include <net/tcp.h> 24 + #include <net/tcp_states.h> 25 25 #include <asm/uaccess.h> 26 26 #include <asm/system.h> 27 27 #include <linux/fcntl.h>
+1 -1
net/netrom/nr_timer.c
··· 22 22 #include <linux/netdevice.h> 23 23 #include <linux/skbuff.h> 24 24 #include <net/sock.h> 25 - #include <net/tcp.h> 25 + #include <net/tcp_states.h> 26 26 #include <asm/uaccess.h> 27 27 #include <asm/system.h> 28 28 #include <linux/fcntl.h>
+1 -1
net/rose/af_rose.c
··· 41 41 #include <net/rose.h> 42 42 #include <linux/proc_fs.h> 43 43 #include <linux/seq_file.h> 44 - #include <net/tcp.h> 44 + #include <net/tcp_states.h> 45 45 #include <net/ip.h> 46 46 #include <net/arp.h> 47 47
+1 -1
net/rose/rose_in.c
··· 27 27 #include <linux/skbuff.h> 28 28 #include <net/sock.h> 29 29 #include <net/ip.h> /* For ip_rcv */ 30 - #include <net/tcp.h> 30 + #include <net/tcp_states.h> 31 31 #include <asm/system.h> 32 32 #include <linux/fcntl.h> 33 33 #include <linux/mm.h>
+1 -1
net/rose/rose_route.c
··· 24 24 #include <linux/if_arp.h> 25 25 #include <linux/skbuff.h> 26 26 #include <net/sock.h> 27 - #include <net/tcp.h> 27 + #include <net/tcp_states.h> 28 28 #include <asm/system.h> 29 29 #include <asm/uaccess.h> 30 30 #include <linux/fcntl.h>
+1 -1
net/rose/rose_subr.c
··· 21 21 #include <linux/netdevice.h> 22 22 #include <linux/skbuff.h> 23 23 #include <net/sock.h> 24 - #include <net/tcp.h> 24 + #include <net/tcp_states.h> 25 25 #include <asm/system.h> 26 26 #include <linux/fcntl.h> 27 27 #include <linux/mm.h>
+1 -1
net/rose/rose_timer.c
··· 22 22 #include <linux/netdevice.h> 23 23 #include <linux/skbuff.h> 24 24 #include <net/sock.h> 25 - #include <net/tcp.h> 25 + #include <net/tcp_states.h> 26 26 #include <asm/system.h> 27 27 #include <linux/fcntl.h> 28 28 #include <linux/mm.h>
+1 -1
net/sctp/ipv6.c
··· 66 66 #include <linux/seq_file.h> 67 67 68 68 #include <net/protocol.h> 69 - #include <net/tcp.h> 70 69 #include <net/ndisc.h> 70 + #include <net/ip.h> 71 71 #include <net/ipv6.h> 72 72 #include <net/transp_v6.h> 73 73 #include <net/addrconf.h>
+1 -2
net/sunrpc/svcsock.c
··· 26 26 #include <linux/in.h> 27 27 #include <linux/inet.h> 28 28 #include <linux/udp.h> 29 - #include <linux/tcp.h> 30 29 #include <linux/unistd.h> 31 30 #include <linux/slab.h> 32 31 #include <linux/netdevice.h> ··· 33 34 #include <net/sock.h> 34 35 #include <net/checksum.h> 35 36 #include <net/ip.h> 36 - #include <net/tcp.h> 37 + #include <net/tcp_states.h> 37 38 #include <asm/uaccess.h> 38 39 #include <asm/ioctls.h> 39 40
+1 -1
net/unix/af_unix.c
··· 105 105 #include <linux/skbuff.h> 106 106 #include <linux/netdevice.h> 107 107 #include <net/sock.h> 108 - #include <linux/tcp.h> 108 + #include <net/tcp_states.h> 109 109 #include <net/af_unix.h> 110 110 #include <linux/proc_fs.h> 111 111 #include <linux/seq_file.h>
+1 -1
net/unix/garbage.c
··· 76 76 #include <linux/netdevice.h> 77 77 #include <linux/file.h> 78 78 #include <linux/proc_fs.h> 79 - #include <linux/tcp.h> 80 79 81 80 #include <net/sock.h> 82 81 #include <net/af_unix.h> 83 82 #include <net/scm.h> 83 + #include <net/tcp_states.h> 84 84 85 85 /* Internal data structures and random procedures: */ 86 86
+1 -1
net/wanrouter/af_wanpipe.c
··· 57 57 #include <linux/wanpipe.h> 58 58 #include <linux/if_wanpipe.h> 59 59 #include <linux/pkt_sched.h> 60 - #include <linux/tcp.h> 60 + #include <linux/tcp_states.h> 61 61 #include <linux/if_wanpipe_common.h> 62 62 #include <linux/sdla_x25.h> 63 63
+1 -1
net/x25/af_x25.c
··· 47 47 #include <linux/if_arp.h> 48 48 #include <linux/skbuff.h> 49 49 #include <net/sock.h> 50 - #include <net/tcp.h> 50 + #include <net/tcp_states.h> 51 51 #include <asm/uaccess.h> 52 52 #include <linux/fcntl.h> 53 53 #include <linux/termios.h> /* For TIOCINQ/OUTQ */
+1 -1
net/x25/x25_in.c
··· 28 28 #include <linux/string.h> 29 29 #include <linux/skbuff.h> 30 30 #include <net/sock.h> 31 - #include <net/tcp.h> 31 + #include <net/tcp_states.h> 32 32 #include <net/x25.h> 33 33 34 34 static int x25_queue_rx_frame(struct sock *sk, struct sk_buff *skb, int more)
+1 -1
net/x25/x25_subr.c
··· 27 27 #include <linux/string.h> 28 28 #include <linux/skbuff.h> 29 29 #include <net/sock.h> 30 - #include <net/tcp.h> 30 + #include <net/tcp_states.h> 31 31 #include <net/x25.h> 32 32 33 33 /*
+1 -1
net/x25/x25_timer.c
··· 23 23 #include <linux/jiffies.h> 24 24 #include <linux/timer.h> 25 25 #include <net/sock.h> 26 - #include <net/tcp.h> 26 + #include <net/tcp_states.h> 27 27 #include <net/x25.h> 28 28 29 29 static void x25_heartbeat_expiry(unsigned long);