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 /include/net/inet_sock.h | |
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 'include/net/inet_sock.h')
-rw-r--r-- | include/net/inet_sock.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index e97b66e2a9d0..139b78b4dfeb 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <net/flow.h> | 24 | #include <net/flow.h> |
25 | #include <net/sock.h> | 25 | #include <net/sock.h> |
26 | #include <net/request_sock.h> | 26 | #include <net/request_sock.h> |
27 | #include <net/route.h> | ||
28 | #include <net/netns/hash.h> | 27 | #include <net/netns/hash.h> |
29 | 28 | ||
30 | /** struct ip_options - IP Options | 29 | /** struct ip_options - IP Options |
@@ -195,12 +194,6 @@ static inline int inet_sk_ehashfn(const struct sock *sk) | |||
195 | return inet_ehashfn(net, laddr, lport, faddr, fport); | 194 | return inet_ehashfn(net, laddr, lport, faddr, fport); |
196 | } | 195 | } |
197 | 196 | ||
198 | |||
199 | static inline int inet_iif(const struct sk_buff *skb) | ||
200 | { | ||
201 | return skb->rtable->rt_iif; | ||
202 | } | ||
203 | |||
204 | static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops) | 197 | static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops) |
205 | { | 198 | { |
206 | struct request_sock *req = reqsk_alloc(ops); | 199 | struct request_sock *req = reqsk_alloc(ops); |