From: "Michael Chan" <mchan@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [PATCH net-next 4/6] cnic: Return proper error code if we fail to send netlink message
Date: Wed, 13 Jul 2011 20:24:20 -0700 [thread overview]
Message-ID: <1310613862-27497-4-git-send-email-mchan@broadcom.com> (raw)
In-Reply-To: <1310613862-27497-3-git-send-email-mchan@broadcom.com>
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>
---
drivers/net/cnic.c | 2 +-
drivers/net/cnic_if.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c
index bdfe155..ea75f65 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 bc7000a..642b9d5 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
--
1.6.4.GIT
next prev parent reply other threads:[~2011-07-14 4:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-14 3:24 [PATCH net-next 1/6] cnic: Replace get_random_bytes() with random32() Michael Chan
2011-07-14 3:24 ` [PATCH net-next 2/6] cnic: Fix port_mode setting Michael Chan
2011-07-14 3:24 ` [PATCH net-next 3/6] cnic: Fix ring setup/shutdown code Michael Chan
2011-07-14 3:24 ` Michael Chan [this message]
2011-07-14 3:24 ` [PATCH net-next 5/6] bnx2: Add MCP dump Michael Chan
2011-07-14 3:24 ` [PATCH net-next 6/6] bnx2: Read iSCSI config from shared memory during ->probe() Michael Chan
2011-07-14 15:46 ` David Miller
2011-07-14 15:46 ` [PATCH net-next 5/6] bnx2: Add MCP dump David Miller
2011-07-14 15:46 ` [PATCH net-next 4/6] cnic: Return proper error code if we fail to send netlink message David Miller
2011-07-14 15:46 ` [PATCH net-next 3/6] cnic: Fix ring setup/shutdown code David Miller
2011-07-14 15:46 ` [PATCH net-next 2/6] cnic: Fix port_mode setting David Miller
2011-07-14 15:46 ` [PATCH net-next 1/6] cnic: Replace get_random_bytes() with random32() David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310613862-27497-4-git-send-email-mchan@broadcom.com \
--to=mchan@broadcom.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).