aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2011-04-04 17:00:54 +0200
committerPatrick McHardy <kaber@trash.net>2011-04-04 17:00:54 +0200
commit0fae2e7740aca7e384c5f337f458897e7e337d58 (patch)
treeff0767f2dc382ee8a62e324e441b671382f0433c /net/ipv4
parent31ad3dd64e689bc79dd819f8f134b9b025240eb8 (diff)
downloadkernel_samsung_espresso10-0fae2e7740aca7e384c5f337f458897e7e337d58.zip
kernel_samsung_espresso10-0fae2e7740aca7e384c5f337f458897e7e337d58.tar.gz
kernel_samsung_espresso10-0fae2e7740aca7e384c5f337f458897e7e337d58.tar.bz2
netfilter: af_info: add 'strict' parameter to limit lookup to .oif
ipv6 fib lookup can set RT6_LOOKUP_F_IFACE flag to restrict search to an interface, but this flag cannot be set via struct flowi. Also, it cannot be set via ip6_route_output: this function uses the passed sock struct to determine if this flag is required (by testing for nonzero sk_bound_dev_if). Work around this by passing in an artificial struct sk in case 'strict' argument is true. This is required to 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index f1035f0..4614bab 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -222,7 +222,7 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,
}
static int nf_ip_route(struct net *net, struct dst_entry **dst,
- struct flowi *fl)
+ struct flowi *fl, bool strict __always_unused)
{
struct rtable *rt = ip_route_output_key(net, &fl->u.ip4);
if (IS_ERR(rt))