git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
net
/
ipv4
/
netfilter.c
diff --git
a/net/ipv4/netfilter.c
b/net/ipv4/netfilter.c
index
f3c0b54
..
4614bab
100644
(file)
--- 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;
}
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;
if (IS_ERR(rt))
return PTR_ERR(rt);
*dst = &rt->dst;