netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ben Hutchings <bhutchings@solarflare.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-net-drivers@solarflare.com
Subject: [PATCH 2/7] sfc: Reject packets from the kernel TX queue during a loopback self-test
Date: Wed, 04 Mar 2009 19:52:37 +0000	[thread overview]
Message-ID: <1236196357.3140.17.camel@achroite> (raw)
In-Reply-To: <1236196272.3140.15.camel@achroite>

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
---
This is necessary because netif_carrier_off() doesn't stop the queue
immediately.

Ben.

 drivers/net/sfc/tx.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c
index da3e9ff..9f97e44 100644
--- a/drivers/net/sfc/tx.c
+++ b/drivers/net/sfc/tx.c
@@ -376,6 +376,9 @@ int efx_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
 	struct efx_nic *efx = netdev_priv(net_dev);
 	struct efx_tx_queue *tx_queue;
 
+	if (unlikely(efx->port_inhibited))
+		return NETDEV_TX_BUSY;
+
 	if (likely(skb->ip_summed == CHECKSUM_PARTIAL))
 		tx_queue = &efx->tx_queue[EFX_TX_QUEUE_OFFLOAD_CSUM];
 	else
-- 
1.5.5

-- 
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.


  reply	other threads:[~2009-03-04 19:52 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-04 19:51 [PATCH 1/7] sfc: Fix efx_ethtool_nway_result() to use clause 45 MDIO registers Ben Hutchings
2009-03-04 19:52 ` Ben Hutchings [this message]
2009-03-05  1:55   ` [PATCH 2/7] sfc: Reject packets from the kernel TX queue during a loopback self-test David Miller
2009-03-04 19:52 ` [PATCH 3/7] sfc: Clean up properly on reset failure paths Ben Hutchings
2009-03-05  1:55   ` David Miller
2009-03-04 19:53 ` [PATCH 4/7] sfc: Clear I2C adapter structure in falcon_remove_nic() Ben Hutchings
2009-03-05  1:55   ` David Miller
2009-03-04 19:53 ` [PATCH 5/7] sfc: Don't wake TX queues while they're being flushed Ben Hutchings
2009-03-05  1:55   ` David Miller
2009-03-04 20:01 ` [PATCH 6/7] sfc: Fix search for flush completion events Ben Hutchings
2009-03-05  1:55   ` David Miller
2009-03-04 20:01 ` [PATCH 7/7] sfc: Improve NIC internal error recovery Ben Hutchings
2009-03-05  1:55   ` David Miller
2009-03-05  1:54 ` [PATCH 1/7] sfc: Fix efx_ethtool_nway_result() to use clause 45 MDIO registers 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=1236196357.3140.17.camel@achroite \
    --to=bhutchings@solarflare.com \
    --cc=davem@davemloft.net \
    --cc=linux-net-drivers@solarflare.com \
    --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).