Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Fixed __e1000_maybe_stop_tx() for e1000e. stable-1.5
authorFlorian Pose <fp@igh-essen.com>
Wed, 05 Dec 2012 12:02:44 +0100
branchstable-1.5
changeset 2472 50b861e981f7
parent 2471 fc64a4b1ec1a
child 2473 f62b64fdbc23
Fixed __e1000_maybe_stop_tx() for e1000e.
devices/e1000e/netdev-2.6.32-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-2.6.33-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-2.6.34-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-2.6.35-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-2.6.37-ethercat.c file | annotate | diff | comparison | revisions
devices/e1000e/netdev-3.2-ethercat.c file | annotate | diff | comparison | revisions 
--- a/devices/e1000e/netdev-2.6.32-ethercat.c	Wed Dec 05 11:47:07 2012 +0100
+++ b/devices/e1000e/netdev-2.6.32-ethercat.c	Wed Dec 05 12:02:44 2012 +0100
@@ -4174,6 +4174,10 @@
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
--- a/devices/e1000e/netdev-2.6.33-ethercat.c	Wed Dec 05 11:47:07 2012 +0100
+++ b/devices/e1000e/netdev-2.6.33-ethercat.c	Wed Dec 05 12:02:44 2012 +0100
@@ -4175,6 +4175,10 @@
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
--- a/devices/e1000e/netdev-2.6.34-ethercat.c	Wed Dec 05 11:47:07 2012 +0100
+++ b/devices/e1000e/netdev-2.6.34-ethercat.c	Wed Dec 05 12:02:44 2012 +0100
@@ -4149,6 +4149,10 @@
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
--- a/devices/e1000e/netdev-2.6.35-ethercat.c	Wed Dec 05 11:47:07 2012 +0100
+++ b/devices/e1000e/netdev-2.6.35-ethercat.c	Wed Dec 05 12:02:44 2012 +0100
@@ -4589,6 +4589,10 @@
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
--- a/devices/e1000e/netdev-2.6.37-ethercat.c	Wed Dec 05 11:47:07 2012 +0100
+++ b/devices/e1000e/netdev-2.6.37-ethercat.c	Wed Dec 05 12:02:44 2012 +0100
@@ -4794,6 +4794,10 @@
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
--- a/devices/e1000e/netdev-3.2-ethercat.c	Wed Dec 05 11:47:07 2012 +0100
+++ b/devices/e1000e/netdev-3.2-ethercat.c	Wed Dec 05 12:02:44 2012 +0100
@@ -4944,6 +4944,10 @@
 {
 	struct e1000_adapter *adapter = netdev_priv(netdev);
 
+	if (adapter->ecdev) {
+		return -EBUSY;
+	}
+
 	netif_stop_queue(netdev);
 	/*
 	 * Herbert's original patch had:
etherlabmaster