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 bdfe15566ce4af86244dce876ee8bc5c0da42d1c..ea75f65a179cd7cd775adad71dbe95ba8c923681 100644 (file)
--- 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 bc7000a2d4e1074460fcdb286315f191e6213677..642b9d56a1c60d34e53afef9f72561440237e5ba 100644 (file)
--- 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