Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

fs/smbfs/sock.c

+1 −1
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
#include <linux/file.h>

#include <linux/in.h>

#include <linux/net.h>

#include <linux/tcp.h>

#include <linux/mm.h>

#include <linux/netdevice.h>

#include <linux/smp_lock.h>

#include <linux/workqueue.h>

#include <net/scm.h>

#include <net/tcp_states.h>

#include <net/ip.h>



#include <linux/smb_fs.h>

include/linux/tcp.h

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

};





enum {

  TCP_ESTABLISHED = 1,

  TCP_SYN_SENT,

  TCP_SYN_RECV,

  TCP_FIN_WAIT1,

  TCP_FIN_WAIT2,

  TCP_TIME_WAIT,

  TCP_CLOSE,

  TCP_CLOSE_WAIT,

  TCP_LAST_ACK,

  TCP_LISTEN,

  TCP_CLOSING,	 /* now a valid state */



  TCP_MAX_STATES /* Leave at the end! */

};



#define TCP_STATE_MASK	0xF

#define TCP_ACTION_FIN	(1 << 7)



enum {

include/net/dn.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include <linux/dn.h>

#include <net/sock.h>

#include <net/tcp.h>

#include <asm/byteorder.h>



typedef unsigned short dn_address;

include/net/inet_hashtables.h

+1 −1
Original line number Diff line number Diff line
@@ -19,11 +19,11 @@ 
#include <linux/list.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/tcp.h>		/* only for TCP_LISTEN, damn :-( */

#include <linux/types.h>

#include <linux/wait.h>



#include <net/sock.h>

#include <net/tcp_states.h>



#include <asm/atomic.h>

include/net/ip6_route.h

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <net/flow.h>

#include <net/ip6_fib.h>

#include <net/sock.h>

#include <linux/tcp.h>

#include <linux/ip.h>

#include <linux/ipv6.h>