diff options
| author | Florian Westphal <fw@strlen.de> | 2011-04-04 16:56:29 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-04 16:56:29 +0200 |
| commit | 31ad3dd64e689bc79dd819f8f134b9b025240eb8 (patch) | |
| tree | 06d2a9afbea2b1b7973e416f18d4588df30fb91a /net/ipv4 | |
| parent | a09d19779f3ffac6e16821accc2c1cc4df1b643a (diff) | |
| download | op-kernel-dev-31ad3dd64e689bc79dd819f8f134b9b025240eb8.zip op-kernel-dev-31ad3dd64e689bc79dd819f8f134b9b025240eb8.tar.gz | |
netfilter: af_info: add network namespace parameter to route hook
This is required to eventually replace the rt6_lookup call in
xt_addrtype.c with nf_afinfo->route().
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c index f3c0b54..f1035f056 100644 --- a/net/ipv4/netfilter.c +++ b/net/ipv4/netfilter.c @@ -221,9 +221,10 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook, return csum; } -static int nf_ip_route(struct dst_entry **dst, struct flowi *fl) +static int nf_ip_route(struct net *net, struct dst_entry **dst, + struct flowi *fl) { - struct rtable *rt = ip_route_output_key(&init_net, &fl->u.ip4); + struct rtable *rt = ip_route_output_key(net, &fl->u.ip4); if (IS_ERR(rt)) return PTR_ERR(rt); *dst = &rt->dst; |
