From: RongQing.Li <roy.qing.li@gmail.com>
Date: Tue, 21 Feb 2012 22:10:50 +0000 (+0000)
Subject: ethernet/broadcom: ip6_route_output() never returns NULL.
X-Git-Tag: v2.6.39-400.9.0~338^2~125
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=980e50d19d0605301cab4f8ddf9eae0cced4027f;p=users%2Fjedix%2Flinux-maple.git

ethernet/broadcom: ip6_route_output() never returns NULL.

ip6_route_output() never returns NULL, so it is wrong to
check if the return value is NULL.

(cherry picked from commit 0541743b4b35f2ddc9e490b4e354930168b60d23)
Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index 291bf6da642b..2d7660d8396b 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -3617,7 +3617,11 @@ static int cnic_get_v6_route(struct sockaddr_in6 *dst_addr,
 		fl6.flowi6_oif = dst_addr->sin6_scope_id;
 
 	*dst = ip6_route_output(&init_net, NULL, &fl6);
-	if (*dst)
+	if ((*dst)->error) {
+		dst_release(*dst);
+		*dst = NULL;
+		return -ENETUNREACH;
+	} else
 		return 0;
 #endif