From 3ec95fa24ed3b3b115a7503017d127d2af51d858 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh.de>
Date: Wed, 5 Dec 2012 11:47:07 +0100
Subject: [PATCH] Fixed __e1000_maybe_stop_tx().

---
 devices/e1000/e1000_main-2.6.20-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.22-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.24-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.26-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.27-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.28-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.29-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.31-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.32-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.33-ethercat.c | 4 ++++
 devices/e1000/e1000_main-2.6.35-ethercat.c | 5 +++++
 devices/e1000/e1000_main-2.6.37-ethercat.c | 4 ++++
 devices/e1000/e1000_main-3.0-ethercat.c    | 4 ++++
 13 files changed, 53 insertions(+)

diff --git a/devices/e1000/e1000_main-2.6.20-ethercat.c b/devices/e1000/e1000_main-2.6.20-ethercat.c
index c6c9fb67..74370e0b 100644
--- a/devices/e1000/e1000_main-2.6.20-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.20-ethercat.c
@@ -3300,6 +3300,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.22-ethercat.c b/devices/e1000/e1000_main-2.6.22-ethercat.c
index db3aea39..22efa6a6 100644
--- a/devices/e1000/e1000_main-2.6.22-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.22-ethercat.c
@@ -3292,6 +3292,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.24-ethercat.c b/devices/e1000/e1000_main-2.6.24-ethercat.c
index dd4ff26c..7b7734d3 100644
--- a/devices/e1000/e1000_main-2.6.24-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.24-ethercat.c
@@ -3292,6 +3292,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.26-ethercat.c b/devices/e1000/e1000_main-2.6.26-ethercat.c
index 2267a55d..466234c9 100644
--- a/devices/e1000/e1000_main-2.6.26-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.26-ethercat.c
@@ -3372,6 +3372,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.27-ethercat.c b/devices/e1000/e1000_main-2.6.27-ethercat.c
index 3f852a57..98e9f239 100644
--- a/devices/e1000/e1000_main-2.6.27-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.27-ethercat.c
@@ -3339,6 +3339,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.28-ethercat.c b/devices/e1000/e1000_main-2.6.28-ethercat.c
index dede4562..e29b7fe7 100644
--- a/devices/e1000/e1000_main-2.6.28-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.28-ethercat.c
@@ -3236,6 +3236,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.29-ethercat.c b/devices/e1000/e1000_main-2.6.29-ethercat.c
index 2a9c90d6..b7b390fb 100644
--- a/devices/e1000/e1000_main-2.6.29-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.29-ethercat.c
@@ -3214,6 +3214,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.31-ethercat.c b/devices/e1000/e1000_main-2.6.31-ethercat.c
index e65c0e98..d0d47113 100644
--- a/devices/e1000/e1000_main-2.6.31-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.31-ethercat.c
@@ -3262,6 +3262,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.32-ethercat.c b/devices/e1000/e1000_main-2.6.32-ethercat.c
index aafc67aa..62280003 100644
--- a/devices/e1000/e1000_main-2.6.32-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.32-ethercat.c
@@ -2951,6 +2951,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.33-ethercat.c b/devices/e1000/e1000_main-2.6.33-ethercat.c
index 9f4a2e7a..4d50e819 100644
--- a/devices/e1000/e1000_main-2.6.33-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.33-ethercat.c
@@ -2975,6 +2975,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.35-ethercat.c b/devices/e1000/e1000_main-2.6.35-ethercat.c
index 9ce348c5..fbde9c66 100644
--- a/devices/e1000/e1000_main-2.6.35-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.35-ethercat.c
@@ -2989,6 +2989,11 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-2.6.37-ethercat.c b/devices/e1000/e1000_main-2.6.37-ethercat.c
index 0c1f3f39..7a4253f4 100644
--- a/devices/e1000/e1000_main-2.6.37-ethercat.c
+++ b/devices/e1000/e1000_main-2.6.37-ethercat.c
@@ -3075,6 +3075,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();
diff --git a/devices/e1000/e1000_main-3.0-ethercat.c b/devices/e1000/e1000_main-3.0-ethercat.c
index 64a662e5..32d9863f 100644
--- a/devices/e1000/e1000_main-3.0-ethercat.c
+++ b/devices/e1000/e1000_main-3.0-ethercat.c
@@ -3106,6 +3106,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 	struct e1000_tx_ring *tx_ring = adapter->tx_ring;
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/* Herbert's original patch had:
 	 *  smp_mb__after_netif_stop_queue();