diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-12-27 02:43:12 -0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-01-03 13:11:21 -0800 |
| commit | 14c850212ed8f8cbb5972ad6b8812e08a0bc901c (patch) | |
| tree | 53c88f03e7bbac4064f6e80d462ad484ee038326 /net/dccp | |
| parent | 25995ff577675b58dbd848b7758e7bad87411947 (diff) | |
| download | linux-3.10-14c850212ed8f8cbb5972ad6b8812e08a0bc901c.tar.gz linux-3.10-14c850212ed8f8cbb5972ad6b8812e08a0bc901c.tar.bz2 linux-3.10-14c850212ed8f8cbb5972ad6b8812e08a0bc901c.zip | |
[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h
To help in reducing the number of include dependencies, several files were
touched as they were getting needed headers indirectly for stuff they use.
Thanks also to Alan Menegotto for pointing out that net/dccp/proto.c had
linux/dccp.h include twice.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/ccid.h | 2 | ||||
| -rw-r--r-- | net/dccp/ipv4.c | 1 | ||||
| -rw-r--r-- | net/dccp/ipv6.c | 1 | ||||
| -rw-r--r-- | net/dccp/output.c | 1 | ||||
| -rw-r--r-- | net/dccp/proto.c | 3 |
5 files changed, 6 insertions, 2 deletions
diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h index c37eeeaf5c6..de681c6ad08 100644 --- a/net/dccp/ccid.h +++ b/net/dccp/ccid.h @@ -21,6 +21,8 @@ #define CCID_MAX 255 +struct tcp_info; + struct ccid { unsigned char ccid_id; const char *ccid_name; diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index 99e8afa7ba1..3f244670764 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -19,6 +19,7 @@ #include <net/icmp.h> #include <net/inet_hashtables.h> +#include <net/inet_sock.h> #include <net/sock.h> #include <net/timewait_sock.h> #include <net/tcp_states.h> diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 2e194c8f995..c609dc78f48 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -20,6 +20,7 @@ #include <net/addrconf.h> #include <net/inet_common.h> #include <net/inet_hashtables.h> +#include <net/inet_sock.h> #include <net/inet6_connection_sock.h> #include <net/inet6_hashtables.h> #include <net/ip6_route.h> diff --git a/net/dccp/output.c b/net/dccp/output.c index 95a3c2c6a3c..efd7ffb903a 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/skbuff.h> +#include <net/inet_sock.h> #include <net/sock.h> #include "ackvec.h" diff --git a/net/dccp/proto.c b/net/dccp/proto.c index e4e629ed9bf..65b11ea90d8 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -24,7 +24,7 @@ #include <net/checksum.h> #include <net/inet_common.h> -#include <net/ip.h> +#include <net/inet_sock.h> #include <net/protocol.h> #include <net/sock.h> #include <net/xfrm.h> @@ -34,7 +34,6 @@ #include <linux/timer.h> #include <linux/delay.h> #include <linux/poll.h> -#include <linux/dccp.h> #include "ccid.h" #include "dccp.h" |