From 4d94396f1a5e693c286c721753da91526b98f525 Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh.de>
Date: Wed, 5 Dec 2012 12:02:44 +0100
Subject: [PATCH] Fixed __e1000_maybe_stop_tx() for e1000e.

---
 devices/e1000e/netdev-2.6.32-ethercat.c | 4 ++++
 devices/e1000e/netdev-2.6.33-ethercat.c | 4 ++++
 devices/e1000e/netdev-2.6.34-ethercat.c | 4 ++++
 devices/e1000e/netdev-2.6.35-ethercat.c | 4 ++++
 devices/e1000e/netdev-2.6.37-ethercat.c | 4 ++++
 devices/e1000e/netdev-3.2-ethercat.c    | 4 ++++
 6 files changed, 24 insertions(+)

diff --git a/devices/e1000e/netdev-2.6.32-ethercat.c b/devices/e1000e/netdev-2.6.32-ethercat.c
index ef95a06a..51a5bd67 100644
--- a/devices/e1000e/netdev-2.6.32-ethercat.c
+++ b/devices/e1000e/netdev-2.6.32-ethercat.c
@@ -4174,6 +4174,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
diff --git a/devices/e1000e/netdev-2.6.33-ethercat.c b/devices/e1000e/netdev-2.6.33-ethercat.c
index 2213ae26..17674b51 100644
--- a/devices/e1000e/netdev-2.6.33-ethercat.c
+++ b/devices/e1000e/netdev-2.6.33-ethercat.c
@@ -4175,6 +4175,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
diff --git a/devices/e1000e/netdev-2.6.34-ethercat.c b/devices/e1000e/netdev-2.6.34-ethercat.c
index ae0b13c9..511ca703 100644
--- a/devices/e1000e/netdev-2.6.34-ethercat.c
+++ b/devices/e1000e/netdev-2.6.34-ethercat.c
@@ -4149,6 +4149,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
diff --git a/devices/e1000e/netdev-2.6.35-ethercat.c b/devices/e1000e/netdev-2.6.35-ethercat.c
index a7644047..5ea0a870 100644
--- a/devices/e1000e/netdev-2.6.35-ethercat.c
+++ b/devices/e1000e/netdev-2.6.35-ethercat.c
@@ -4589,6 +4589,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
diff --git a/devices/e1000e/netdev-2.6.37-ethercat.c b/devices/e1000e/netdev-2.6.37-ethercat.c
index bd023223..21be7963 100644
--- a/devices/e1000e/netdev-2.6.37-ethercat.c
+++ b/devices/e1000e/netdev-2.6.37-ethercat.c
@@ -4794,6 +4794,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
diff --git a/devices/e1000e/netdev-3.2-ethercat.c b/devices/e1000e/netdev-3.2-ethercat.c
index ea5be1a3..5dc78176 100644
--- a/devices/e1000e/netdev-3.2-ethercat.c
+++ b/devices/e1000e/netdev-3.2-ethercat.c
@@ -4944,6 +4944,10 @@ static int __e1000_maybe_stop_tx(struct net_device *netdev, int size)
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had: