Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
net
/
ipv6
/
netfilter
/
ip6t_rpfilter.c
diff --git
a/kernel/net/ipv6/netfilter/ip6t_rpfilter.c
b/kernel/net/ipv6/netfilter/ip6t_rpfilter.c
index
790e0c6
..
1ee1b25
100644
(file)
--- a/
kernel/net/ipv6/netfilter/ip6t_rpfilter.c
+++ b/
kernel/net/ipv6/netfilter/ip6t_rpfilter.c
@@
-26,7
+26,7
@@
static bool rpfilter_addr_unicast(const struct in6_addr *addr)
return addr_type & IPV6_ADDR_UNICAST;
}
return addr_type & IPV6_ADDR_UNICAST;
}
-static bool rpfilter_lookup_reverse6(const struct sk_buff *skb,
+static bool rpfilter_lookup_reverse6(
struct net *net,
const struct sk_buff *skb,
const struct net_device *dev, u8 flags)
{
struct rt6_info *rt;
const struct net_device *dev, u8 flags)
{
struct rt6_info *rt;
@@
-53,7
+53,7
@@
static bool rpfilter_lookup_reverse6(const struct sk_buff *skb,
lookup_flags |= RT6_LOOKUP_F_IFACE;
}
lookup_flags |= RT6_LOOKUP_F_IFACE;
}
- rt = (void *) ip6_route_lookup(
dev_net(dev)
, &fl6, lookup_flags);
+ rt = (void *) ip6_route_lookup(
net
, &fl6, lookup_flags);
if (rt->dst.error)
goto out;
if (rt->dst.error)
goto out;
@@
-93,7
+93,7
@@
static bool rpfilter_mt(const struct sk_buff *skb, struct xt_action_param *par)
if (unlikely(saddrtype == IPV6_ADDR_ANY))
return true ^ invert; /* not routable: forward path will drop it */
if (unlikely(saddrtype == IPV6_ADDR_ANY))
return true ^ invert; /* not routable: forward path will drop it */
- return rpfilter_lookup_reverse6(skb, par->in, info->flags) ^ invert;
+ return rpfilter_lookup_reverse6(
par->net,
skb, par->in, info->flags) ^ invert;
}
static int rpfilter_check(const struct xt_mtchk_param *par)
}
static int rpfilter_check(const struct xt_mtchk_param *par)