From c752f0739f09b803aed191c4765a3b6650a08653 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Date: Tue, 9 Aug 2005 20:08:28 -0700
Subject: [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>
---
 net/ax25/ax25_ds_in.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'net/ax25/ax25_ds_in.c')

diff --git a/net/ax25/ax25_ds_in.c b/net/ax25/ax25_ds_in.c
index 8adc0022cf5..5d0f8fb9d7a 100644
--- a/net/ax25/ax25_ds_in.c
+++ b/net/ax25/ax25_ds_in.c
@@ -23,7 +23,7 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <net/ip.h>			/* For ip_rcv */
-#include <net/tcp.h>
+#include <net/tcp_states.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <linux/fcntl.h>
-- 
cgit v1.2.3-70-g09d2


From c91326db013ddff478da8a8d66fb99ef4579f19a Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 24 Aug 2005 11:37:45 -0700
Subject: [AX25/NETROM/ROSE]: Kill net/ip.h inclusion

All these are claiming to include <net/ip.h> to get ip_rcv() but in
fact don't need the header at all, so away with the inclusion.

Signed-off-by: Ralf Baechle DL5RB <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/ax25/ax25_ds_in.c  | 1 -
 net/ax25/ax25_std_in.c | 1 -
 net/netrom/nr_in.c     | 1 -
 net/rose/rose_in.c     | 1 -
 4 files changed, 4 deletions(-)

(limited to 'net/ax25/ax25_ds_in.c')

diff --git a/net/ax25/ax25_ds_in.c b/net/ax25/ax25_ds_in.c
index 5d0f8fb9d7a..edcaa897027 100644
--- a/net/ax25/ax25_ds_in.c
+++ b/net/ax25/ax25_ds_in.c
@@ -22,7 +22,6 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <net/ip.h>			/* For ip_rcv */
 #include <net/tcp_states.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
diff --git a/net/ax25/ax25_std_in.c b/net/ax25/ax25_std_in.c
index 83a33387c06..f6ed283e9de 100644
--- a/net/ax25/ax25_std_in.c
+++ b/net/ax25/ax25_std_in.c
@@ -29,7 +29,6 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <net/ip.h>			/* For ip_rcv */
 #include <net/tcp_states.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c
index 2fcba9e24b2..64b81a79690 100644
--- a/net/netrom/nr_in.c
+++ b/net/netrom/nr_in.c
@@ -23,7 +23,6 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
-#include <net/ip.h>			/* For ip_rcv */
 #include <asm/uaccess.h>
 #include <asm/system.h>
 #include <linux/fcntl.h>
diff --git a/net/rose/rose_in.c b/net/rose/rose_in.c
index a52417bd0a1..8348d33f1ef 100644
--- a/net/rose/rose_in.c
+++ b/net/rose/rose_in.c
@@ -26,7 +26,6 @@
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <net/sock.h>
-#include <net/ip.h>			/* For ip_rcv */
 #include <net/tcp_states.h>
 #include <asm/system.h>
 #include <linux/fcntl.h>
-- 
cgit v1.2.3-70-g09d2