From: Michael Chan <mchan@broadcom.com>
Date: Wed, 13 Jul 2011 17:24:20 +0000 (+0000)
Subject: cnic: Return proper error code if we fail to send netlink message
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=558e4c758c4c7bf209325f5865189c6558860b2b;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

cnic: Return proper error code if we fail to send netlink message

to allow iSCSI connection to fail faster instead of waiting for the
long timeout.

Update version to 2.5.6.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index bdfe15566ce4..ea75f65a179c 100644
--- a/drivers/net/cnic.c
+++ b/drivers/net/cnic.c
@@ -328,7 +328,7 @@ static int cnic_send_nlmsg(struct cnic_local *cp, u32 type,
 		msleep(100);
 		retry++;
 	}
-	return 0;
+	return rc;
 }
 
 static void cnic_cm_upcall(struct cnic_local *, struct cnic_sock *, u8);
diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index bc7000a2d4e1..642b9d56a1c6 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION	"2.5.3"
-#define CNIC_MODULE_RELDATE	"June 6, 2011"
+#define CNIC_MODULE_VERSION	"2.5.6"
+#define CNIC_MODULE_RELDATE	"July 12, 2011"
 
 #define CNIC_ULP_RDMA		0
 #define CNIC_ULP_ISCSI		1