diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-06 17:04:13 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-06 17:04:13 -0500 |
| commit | 87a115783eca7a424eef599d6f10a499f85f59c8 (patch) | |
| tree | 4b80b4d2ea9a61253f89570f63da1ab9a356dfa4 /include/net/ip6_route.h | |
| parent | 8f0315190dec88bf035d50e4fd1db89859b414f6 (diff) | |
| download | kernel-common-87a115783eca7a424eef599d6f10a499f85f59c8.tar.gz kernel-common-87a115783eca7a424eef599d6f10a499f85f59c8.tar.bz2 kernel-common-87a115783eca7a424eef599d6f10a499f85f59c8.zip | |
ipv6: Move xfrm_lookup() call down into icmp6_dst_alloc().
And return error pointers.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip6_route.h')
| -rw-r--r-- | include/net/ip6_route.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index f9dbf472bf58..789d5f47d5e3 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -95,7 +95,7 @@ extern struct rt6_info *rt6_lookup(struct net *net, extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev, struct neighbour *neigh, - const struct in6_addr *addr); + struct flowi6 *fl6); extern int icmp6_dst_gc(void); extern void fib6_force_start_gc(struct net *net); |