diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-03-18 23:29:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-18 23:29:41 -0400 |
| commit | 4da0bd736552e6377b407b3c3d3ae518ebbdd269 (patch) | |
| tree | f0da9f843b8033565c3ca4103fccb17a60688326 /net/ipv6/route.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next (diff) | |
| parent | Linux 3.3 (diff) | |
| download | linux-dev-4da0bd736552e6377b407b3c3d3ae518ebbdd269.tar.xz linux-dev-4da0bd736552e6377b407b3c3d3ae518ebbdd269.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/route.c')
| -rw-r--r-- | net/ipv6/route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 92be12bb8d23..24c456e8aa1d 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -1090,7 +1090,7 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, struct net *net = dev_net(dev); if (unlikely(!idev)) - return NULL; + return ERR_PTR(-ENODEV); rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops, dev, 0); if (unlikely(!rt)) { |