diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-05 23:21:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-05 23:21:11 +0200 |
| commit | 9d9305949778c41b92d4394a2f2a6bcdb1c41a9c (patch) | |
| tree | d49d536ae8156ad9989dc7b26e3897f21e549b02 /net/ipv4 | |
| parent | ipv6: Don't pass invalid dst_entry pointer to dst_release(). (diff) | |
| parent | netfilter: xt_conntrack: fix inverted conntrack direction test (diff) | |
| download | linux-9d9305949778c41b92d4394a2f2a6bcdb1c41a9c.tar.xz linux-9d9305949778c41b92d4394a2f2a6bcdb1c41a9c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
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 f3c0b549b8e1..4614babdc45f 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, bool strict __always_unused) { - 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; |