diff options
| author | KOVACS Krisztian <hidden@sch.bme.hu> | 2008-10-01 07:33:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-01 07:33:10 -0700 |
| commit | 1668e010cbe1a7567c81d4c02d31dde9859e9da1 (patch) | |
| tree | f3505d22a93ed9a4b6140a7f98a9d4cc2c1f66e9 /include/net | |
| parent | b9fb15067ce93497bef852c05e406d7a96212a9a (diff) | |
| download | kernel_samsung_espresso10-1668e010cbe1a7567c81d4c02d31dde9859e9da1.zip kernel_samsung_espresso10-1668e010cbe1a7567c81d4c02d31dde9859e9da1.tar.gz kernel_samsung_espresso10-1668e010cbe1a7567c81d4c02d31dde9859e9da1.tar.bz2 | |
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 'include/net')
| -rw-r--r-- | include/net/inet_sock.h | 7 | ||||
| -rw-r--r-- | include/net/ip_vs.h | 1 | ||||
| -rw-r--r-- | include/net/route.h | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index e97b66e..139b78b 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -24,7 +24,6 @@ #include <net/flow.h> #include <net/sock.h> #include <net/request_sock.h> -#include <net/route.h> #include <net/netns/hash.h> /** struct ip_options - IP Options @@ -195,12 +194,6 @@ static inline int inet_sk_ehashfn(const struct sock *sk) return inet_ehashfn(net, laddr, lport, faddr, fport); } - -static inline int inet_iif(const struct sk_buff *skb) -{ - return skb->rtable->rt_iif; -} - static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops) { struct request_sock *req = reqsk_alloc(ops); diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 33e2ac6..0b2071d 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -22,6 +22,7 @@ #include <net/checksum.h> #include <linux/netfilter.h> /* for union nf_inet_addr */ +#include <linux/ip.h> #include <linux/ipv6.h> /* for struct ipv6hdr */ #include <net/ipv6.h> /* for ipv6_addr_copy */ diff --git a/include/net/route.h b/include/net/route.h index 4f0d8c1..31d1485 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -204,4 +204,9 @@ static inline struct inet_peer *rt_get_peer(struct rtable *rt) return rt->peer; } +static inline int inet_iif(const struct sk_buff *skb) +{ + return skb->rtable->rt_iif; +} + #endif /* _ROUTE_H */ |