From 573764e0da55cfb5f302baed8bda5ae2f8dea70f Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 4 Mar 2009 09:52:37 +0000
Subject: [PATCH] --- yaml --- r: 135052 b: refs/heads/master c:
 a7ef59332b33cb1924ea76cce2aa620a32bb0d7a h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sfc/tx.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cc384afdab35..70b669ede4f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca83db369c1c633142c08dd0bfafca6ac4247c63
+refs/heads/master: a7ef59332b33cb1924ea76cce2aa620a32bb0d7a
diff --git a/trunk/drivers/net/sfc/tx.c b/trunk/drivers/net/sfc/tx.c
index da3e9ff339f5..9f97e44840b6 100644
--- a/trunk/drivers/net/sfc/tx.c
+++ b/trunk/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