korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-25 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

ipv4: Make inet_sock.h independent of route.h

Browse Source 
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>
This commit is contained in:
KOVACS Krisztian 2008-10-01 07:33:10 -07:00 committed by David S. Miller
parent b9fb15067c
commit 1668e010cb
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/inet_sock.h
View File

@ -24,7 +24,6 @@
#include <net/flow.h> #include <net/flow.h>
#include <net/sock.h> #include <net/sock.h>
#include <net/request_sock.h> #include <net/request_sock.h>
#include <net/route.h>
#include <net/netns/hash.h> #include <net/netns/hash.h>
/** struct ip_options - IP Options /** 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); 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) static inline struct request_sock *inet_reqsk_alloc(struct request_sock_ops *ops)
{ {
struct request_sock *req = reqsk_alloc(ops); struct request_sock *req = reqsk_alloc(ops);

1
include/net/ip_vs.h
View File

@ -22,6 +22,7 @@
#include <net/checksum.h> #include <net/checksum.h>
#include <linux/netfilter.h> /* for union nf_inet_addr */ #include <linux/netfilter.h> /* for union nf_inet_addr */
#include <linux/ip.h>
#include <linux/ipv6.h> /* for struct ipv6hdr */ #include <linux/ipv6.h> /* for struct ipv6hdr */
#include <net/ipv6.h> /* for ipv6_addr_copy */ #include <net/ipv6.h> /* for ipv6_addr_copy */

5
include/net/route.h
View File

@ -204,4 +204,9 @@ static inline struct inet_peer *rt_get_peer(struct rtable *rt)
return rt->peer; return rt->peer;
} }
static inline int inet_iif(const struct sk_buff *skb)
{
return skb->rtable->rt_iif;
}
#endif /* _ROUTE_H */ #endif /* _ROUTE_H */

1
net/ipv4/netfilter/nf_nat_helper.c
View File

@ -16,6 +16,7 @@
#include <linux/udp.h> #include <linux/udp.h>
#include <net/checksum.h> #include <net/checksum.h>
#include <net/tcp.h> #include <net/tcp.h>
#include <net/route.h>
#include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4.h>
#include <net/netfilter/nf_conntrack.h> #include <net/netfilter/nf_conntrack.h>

1
net/ipv6/af_inet6.c
View File

@ -50,6 +50,7 @@
#include <net/ipip.h> #include <net/ipip.h>
#include <net/protocol.h> #include <net/protocol.h>
#include <net/inet_common.h> #include <net/inet_common.h>
#include <net/route.h>
#include <net/transp_v6.h> #include <net/transp_v6.h>
#include <net/ip6_route.h> #include <net/ip6_route.h>
#include <net/addrconf.h> #include <net/addrconf.h>