diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-06 23:04:13 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-06 23:04:13 +0100 |
| commit | 87a115783eca7a424eef599d6f10a499f85f59c8 (patch) | |
| tree | 4b80b4d2ea9a61253f89570f63da1ab9a356dfa4 /net/ipv6/ndisc.c | |
| parent | ipv6: Make third arg to anycast_dst_alloc() bool. (diff) | |
| download | linux-87a115783eca7a424eef599d6f10a499f85f59c8.tar.xz linux-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 'net/ipv6/ndisc.c')
| -rw-r--r-- | net/ipv6/ndisc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index e72c8af85781..f3e50c29add4 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -516,14 +516,7 @@ void ndisc_send_skb(struct sk_buff *skb, type = icmp6h->icmp6_type; icmpv6_flow_init(sk, &fl6, type, saddr, daddr, dev->ifindex); - - dst = icmp6_dst_alloc(dev, neigh, daddr); - if (!dst) { - kfree_skb(skb); - return; - } - - dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); + dst = icmp6_dst_alloc(dev, neigh, &fl6); if (IS_ERR(dst)) { kfree_skb(skb); return; |