From: Brice Goglin <brice@myri.com>
To: Jeff Garzik <jeff@garzik.org>
Cc: netdev@vger.kernel.org
Subject: [PATCH 1/4] myri10ge: fix error checking and return value in myri10ge_allocate_rings
Date: Wed, 07 Mar 2007 19:59:52 +0100 [thread overview]
Message-ID: <45EF0BA8.3080903@myri.com> (raw)
In-Reply-To: <45EF0B6C.9070005@myri.com>
Fix a missing error check in myri10ge_allocate_rings() and set status
to -ENOMEM before all actual allocations so that the error path returns
what it should.
Signed-off-by: Brice Goglin <brice@myri.com>
---
drivers/net/myri10ge/myri10ge.c | 4 ++++
1 file changed, 4 insertions(+)
Index: linux-rc/drivers/net/myri10ge/myri10ge.c
===================================================================
--- linux-rc.orig/drivers/net/myri10ge/myri10ge.c 2007-03-07 08:49:08.000000000 +0100
+++ linux-rc/drivers/net/myri10ge/myri10ge.c 2007-03-07 08:51:07.000000000 +0100
@@ -1456,6 +1456,8 @@
status = myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_SEND_RING_SIZE, &cmd, 0);
tx_ring_size = cmd.data0;
status |= myri10ge_send_cmd(mgp, MXGEFW_CMD_GET_RX_RING_SIZE, &cmd, 0);
+ if (status != 0)
+ return status;
rx_ring_size = cmd.data0;
tx_ring_entries = tx_ring_size / sizeof(struct mcp_kreq_ether_send);
@@ -1463,6 +1465,8 @@
mgp->tx.mask = tx_ring_entries - 1;
mgp->rx_small.mask = mgp->rx_big.mask = rx_ring_entries - 1;
+ status = -ENOMEM;
+
/* allocate the host shadow rings */
bytes = 8 + (MYRI10GE_MAX_SEND_DESC_TSO + 4)
next prev parent reply other threads:[~2007-03-07 19:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-07 18:58 [PATCH 0/4] myri10ge minor updates Brice Goglin
2007-03-07 18:59 ` Brice Goglin [this message]
2007-03-09 16:52 ` [PATCH 1/4] myri10ge: fix error checking and return value in myri10ge_allocate_rings Jeff Garzik
2007-03-07 19:00 ` [PATCH 2/4] myri10ge: use pci_map_page to prepare the dmatest buffer Brice Goglin
2007-03-07 19:01 ` [PATCH 3/4] myri10ge: prevent 4k rdma on SGI TIOCE chipset Brice Goglin
2007-03-07 19:02 ` [PATCH 4/4] myri10ge: add a wc_enabled flag to myri10ge_priv Brice Goglin
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=45EF0BA8.3080903@myri.com \
--to=brice@myri.com \
--cc=jeff@garzik.org \
--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).