Merge branch 'nf-next' of git://1984.lsi.us.es/net-next

This commit is contained in:
David S. Miller
2011-12-25 02:21:45 -05:00
59 changed files with 1168 additions and 378 deletions

View File

@ -658,6 +658,13 @@ out:
}
struct dst_entry * ip6_route_lookup(struct net *net, struct flowi6 *fl6,
int flags)
{
return fib6_rule_lookup(net, fl6, flags, ip6_pol_route_lookup);
}
EXPORT_SYMBOL_GPL(ip6_route_lookup);
struct rt6_info *rt6_lookup(struct net *net, const struct in6_addr *daddr,
const struct in6_addr *saddr, int oif, int strict)
{