diff options
author | KOVACS Krisztian <hidden@sch.bme.hu> | 2008-10-01 10:33:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-01 10:33:10 -0400 |
commit | 1668e010cbe1a7567c81d4c02d31dde9859e9da1 (patch) | |
tree | f3505d22a93ed9a4b6140a7f98a9d4cc2c1f66e9 /net | |
parent | b9fb15067ce93497bef852c05e406d7a96212a9a (diff) |
ipv4: Make inet_sock.h independent of route.h
inet_iif() in inet_sock.h requires route.h. Since users of inet_iif()
usually require other route.h functionality anyway this patch moves
inet_iif() to route.h.
Signed-off-by: KOVACS Krisztian <hidden@sch.bme.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/netfilter/nf_nat_helper.c | 1 | ||||
-rw-r--r-- | net/ipv6/af_inet6.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/netfilter/nf_nat_helper.c b/net/ipv4/netfilter/nf_nat_helper.c index 11976ea29884..112dcfa12900 100644 --- a/net/ipv4/netfilter/nf_nat_helper.c +++ b/net/ipv4/netfilter/nf_nat_helper.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/udp.h> | 16 | #include <linux/udp.h> |
17 | #include <net/checksum.h> | 17 | #include <net/checksum.h> |
18 | #include <net/tcp.h> | 18 | #include <net/tcp.h> |
19 | #include <net/route.h> | ||
19 | 20 | ||
20 | #include <linux/netfilter_ipv4.h> | 21 | #include <linux/netfilter_ipv4.h> |
21 | #include <net/netfilter/nf_conntrack.h> | 22 | #include <net/netfilter/nf_conntrack.h> |
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 95055f8c3f35..f018704ecb86 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <net/ipip.h> | 50 | #include <net/ipip.h> |
51 | #include <net/protocol.h> | 51 | #include <net/protocol.h> |
52 | #include <net/inet_common.h> | 52 | #include <net/inet_common.h> |
53 | #include <net/route.h> | ||
53 | #include <net/transp_v6.h> | 54 | #include <net/transp_v6.h> |
54 | #include <net/ip6_route.h> | 55 | #include <net/ip6_route.h> |
55 | #include <net/addrconf.h> | 56 | #include <net/addrconf.h> |