From e2ee1f7fd030f66ba25450bc9157156cc55c1bc7 Mon Sep 17 00:00:00 2001
From: "RongQing.Li" <roy.qing.li@gmail.com>
Date: Tue, 21 Feb 2012 22:10:50 +0000
Subject: [PATCH] --- yaml --- r: 287983 b: refs/heads/master c:
 0541743b4b35f2ddc9e490b4e354930168b60d23 h: refs/heads/master i:   287981:
 989847fb9a4ec763160f395ee0d89a3c409743d3   287979:
 7259afaa3c9c0844730b2aab816cd173250a8c54   287975:
 5b1d055808b74aca2cbd2de5047574b473b61bf6   287967:
 31626390b36c83a3fcdc1203d6061f28a8cc17e7 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/broadcom/cnic.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 92d19c65d4af..a51a26ae451c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5095d64db1b978bdb31d30fed9e47dbf04f729be
+refs/heads/master: 0541743b4b35f2ddc9e490b4e354930168b60d23
diff --git a/trunk/drivers/net/ethernet/broadcom/cnic.c b/trunk/drivers/net/ethernet/broadcom/cnic.c
index dd3a0a232ea0..818a573669e6 100644
--- a/trunk/drivers/net/ethernet/broadcom/cnic.c
+++ b/trunk/drivers/net/ethernet/broadcom/cnic.c
@@ -3584,7 +3584,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