From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Mitch Williams <mitch.a.williams@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 10/15] i40e: not all VSIs have rings
Date: Sun, 8 Jun 2014 07:33:52 -0700 [thread overview]
Message-ID: <1402238037-20661-11-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1402238037-20661-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Mitch Williams <mitch.a.williams@intel.com>
Once more, with feeling: not all VSIs have rings. To assume so is to
invite null pointers to your party.
Change-ID: I576858824468d9712d119fa1015a1f28c27712c4
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index a8c9612..4502734 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -657,7 +657,7 @@ static void i40e_update_link_xoff_rx(struct i40e_pf *pf)
for (v = 0; v < pf->hw.func_caps.num_vsis; v++) {
struct i40e_vsi *vsi = pf->vsi[v];
- if (!vsi)
+ if (!vsi || !vsi->tx_rings[0])
continue;
for (i = 0; i < vsi->num_queue_pairs; i++) {
@@ -711,7 +711,7 @@ static void i40e_update_prio_xoff_rx(struct i40e_pf *pf)
for (v = 0; v < pf->hw.func_caps.num_vsis; v++) {
struct i40e_vsi *vsi = pf->vsi[v];
- if (!vsi)
+ if (!vsi || !vsi->tx_rings[0])
continue;
for (i = 0; i < vsi->num_queue_pairs; i++) {
--
1.9.3
next prev parent reply other threads:[~2014-06-08 14:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-08 14:33 [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2014-06-08 Jeff Kirsher
2014-06-08 14:33 ` [net-next 01/15] i40e/i40evf: fix rx descriptor status Jeff Kirsher
2014-06-08 14:33 ` [net-next 02/15] i40e/i40evf: Fix code to accommodate i40e_register.h changes Jeff Kirsher
2014-06-08 14:33 ` [net-next 03/15] i40e/i40evf: Clean up a few things Jeff Kirsher
2014-06-08 14:33 ` [net-next 04/15] i40evf: remove unnecessary log messages Jeff Kirsher
2014-06-08 17:23 ` Joe Perches
2014-06-08 14:33 ` [net-next 05/15] i40evf: remove bogus comment Jeff Kirsher
2014-06-08 14:33 ` [net-next 06/15] i40evf: clean up log message formatting Jeff Kirsher
2014-06-08 14:33 ` [net-next 07/15] i40evf: use correct format for printing MAC addresses Jeff Kirsher
2014-06-08 14:33 ` [net-next 08/15] i40e: Fix incorrect feature configuration status Jeff Kirsher
2014-06-08 14:33 ` [net-next 09/15] i40e: clear pxe after adminq is rebuilt Jeff Kirsher
2014-06-08 14:33 ` Jeff Kirsher [this message]
2014-06-08 14:33 ` [net-next 11/15] i40e/i40evf: remove chatty reset messages Jeff Kirsher
2014-06-08 17:34 ` Joe Perches
2014-06-08 19:06 ` Williams, Mitch A
2014-06-08 14:33 ` [net-next 12/15] i40e/i40evf: fix TSO accounting Jeff Kirsher
2014-06-08 14:33 ` [net-next 13/15] i40e/i40evf: fix poll weight Jeff Kirsher
2014-06-08 14:33 ` [net-next 14/15] i40e/i40evf: remove deprecated device IDs Jeff Kirsher
2014-06-08 14:33 ` [net-next 15/15] i40e/i40evf: Bump build version Jeff Kirsher
2014-06-08 21:08 ` [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2014-06-08 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=1402238037-20661-11-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=mitch.a.williams@intel.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.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;
as well as URLs for NNTP newsgroup(s).