From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
To: netdev@vger.kernel.org
Cc: brking@linux.vnet.ibm.com, jallen@linux.vnet.ibm.com,
muvic@linux.vnet.ibm.com, tlfalcon@linux.vnet.ibm.com
Subject: [PATCH v4 net-next 08/11] ibmvnic: Check for driver reset first in ibmvnic_xmit
Date: Wed, 03 May 2017 14:05:08 -0400 [thread overview]
Message-ID: <20170503180508.29742.4761.stgit@ltcalpine2-lp23.aus.stglabs.ibm.com> (raw)
In-Reply-To: <20170503180246.29742.64039.stgit@ltcalpine2-lp23.aus.stglabs.ibm.com>
Move the check for the driver resetting to the first thing
in ibmvnic_xmit().
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index a312bc1..f1ee377 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -985,12 +985,6 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
int index = 0;
int ret = 0;
- tx_pool = &adapter->tx_pool[queue_num];
- tx_scrq = adapter->tx_scrq[queue_num];
- txq = netdev_get_tx_queue(netdev, skb_get_queue_mapping(skb));
- handle_array = (u64 *)((u8 *)(adapter->login_rsp_buf) +
- be32_to_cpu(adapter->login_rsp_buf->
- off_txsubm_subcrqs));
if (adapter->resetting) {
if (!netif_subqueue_stopped(netdev, skb))
netif_stop_subqueue(netdev, queue_num);
@@ -1002,6 +996,12 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev)
goto out;
}
+ tx_pool = &adapter->tx_pool[queue_num];
+ tx_scrq = adapter->tx_scrq[queue_num];
+ txq = netdev_get_tx_queue(netdev, skb_get_queue_mapping(skb));
+ handle_array = (u64 *)((u8 *)(adapter->login_rsp_buf) +
+ be32_to_cpu(adapter->login_rsp_buf->off_txsubm_subcrqs));
+
index = tx_pool->free_map[tx_pool->consumer_index];
offset = index * adapter->req_mtu;
dst = tx_pool->long_term_buff.buff + offset;
next prev parent reply other threads:[~2017-05-03 14:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-03 18:04 [PATCH v4 net-next 00/11] ibmvnic: Updated reset handler and code fixes Nathan Fontenot
2017-05-03 15:33 ` David Miller
2017-05-03 18:04 ` [PATCH v4 net-next 01/11] ibmvnic: Move resource initialization to its own routine Nathan Fontenot
2017-05-03 18:04 ` [PATCH v4 net-next 02/11] ibmvnic: Replace is_closed with state field Nathan Fontenot
2017-05-03 18:04 ` [PATCH v4 net-next 03/11] ibmvnic: Updated reset handling Nathan Fontenot
2017-05-03 18:04 ` [PATCH v4 net-next 04/11] ibmvnic: Delete napi's when releasing driver resources Nathan Fontenot
2017-05-03 18:04 ` [PATCH v4 net-next 05/11] ibmvnic: Whitespace correction in release_rx_pools Nathan Fontenot
2017-05-03 18:04 ` [PATCH v4 net-next 06/11] ibmvnic: Clean up tx pools when closing Nathan Fontenot
2017-05-03 18:05 ` [PATCH v4 net-next 07/11] ibmvnic: Wait for any pending scrqs entries at driver close Nathan Fontenot
2017-05-03 18:05 ` Nathan Fontenot [this message]
2017-05-03 18:05 ` [PATCH v4 net-next 09/11] ibmvnic: Continue skb processing after skb completion error Nathan Fontenot
2017-05-03 18:05 ` [PATCH v4 net-next 10/11] ibmvnic: Record SKB RX queue during poll Nathan Fontenot
2017-05-03 18:05 ` [PATCH v4 net-next 11/11] ibmvnic: Move queue restarting in ibmvnic_tx_complete Nathan Fontenot
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=20170503180508.29742.4761.stgit@ltcalpine2-lp23.aus.stglabs.ibm.com \
--to=nfont@linux.vnet.ibm.com \
--cc=brking@linux.vnet.ibm.com \
--cc=jallen@linux.vnet.ibm.com \
--cc=muvic@linux.vnet.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=tlfalcon@linux.vnet.ibm.com \
/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