From c67691de427582e85af62dae583e78e7bca04d82 Mon Sep 17 00:00:00 2001 From: Florian Pose Date: Thu, 19 Feb 2015 15:19:29 +0100 Subject: [PATCH] Fixed bug concerning netdev_completed_queue(); thanks to B. Benner. --- devices/e1000/e1000_main-3.10-ethercat.c | 4 +++- devices/e1000/e1000_main-3.12-ethercat.c | 4 +++- devices/e1000/e1000_main-3.14-ethercat.c | 4 +++- devices/e1000/e1000_main-3.16-ethercat.c | 4 +++- devices/e1000/e1000_main-3.8-ethercat.c | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/devices/e1000/e1000_main-3.10-ethercat.c b/devices/e1000/e1000_main-3.10-ethercat.c index 858365e3..5f3c097c 100644 --- a/devices/e1000/e1000_main-3.10-ethercat.c +++ b/devices/e1000/e1000_main-3.10-ethercat.c @@ -4004,7 +4004,9 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, tx_ring->next_to_clean = i; - netdev_completed_queue(netdev, pkts_compl, bytes_compl); + if (!adapter->ecdev) { + netdev_completed_queue(netdev, pkts_compl, bytes_compl); + } #define TX_WAKE_THRESHOLD 32 if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) && diff --git a/devices/e1000/e1000_main-3.12-ethercat.c b/devices/e1000/e1000_main-3.12-ethercat.c index eab52e19..d1e0dc96 100644 --- a/devices/e1000/e1000_main-3.12-ethercat.c +++ b/devices/e1000/e1000_main-3.12-ethercat.c @@ -4004,7 +4004,9 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, tx_ring->next_to_clean = i; - netdev_completed_queue(netdev, pkts_compl, bytes_compl); + if (!adapter->ecdev) { + netdev_completed_queue(netdev, pkts_compl, bytes_compl); + } #define TX_WAKE_THRESHOLD 32 if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) && diff --git a/devices/e1000/e1000_main-3.14-ethercat.c b/devices/e1000/e1000_main-3.14-ethercat.c index b04693bc..e085fe4b 100644 --- a/devices/e1000/e1000_main-3.14-ethercat.c +++ b/devices/e1000/e1000_main-3.14-ethercat.c @@ -3982,7 +3982,9 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, tx_ring->next_to_clean = i; - netdev_completed_queue(netdev, pkts_compl, bytes_compl); + if (!adapter->ecdev) { + netdev_completed_queue(netdev, pkts_compl, bytes_compl); + } #define TX_WAKE_THRESHOLD 32 if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) && diff --git a/devices/e1000/e1000_main-3.16-ethercat.c b/devices/e1000/e1000_main-3.16-ethercat.c index 236bfb77..a5f320e3 100644 --- a/devices/e1000/e1000_main-3.16-ethercat.c +++ b/devices/e1000/e1000_main-3.16-ethercat.c @@ -3974,7 +3974,9 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, tx_ring->next_to_clean = i; - netdev_completed_queue(netdev, pkts_compl, bytes_compl); + if (!adapter->ecdev) { + netdev_completed_queue(netdev, pkts_compl, bytes_compl); + } #define TX_WAKE_THRESHOLD 32 if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) && diff --git a/devices/e1000/e1000_main-3.8-ethercat.c b/devices/e1000/e1000_main-3.8-ethercat.c index 43e16707..2d32709c 100644 --- a/devices/e1000/e1000_main-3.8-ethercat.c +++ b/devices/e1000/e1000_main-3.8-ethercat.c @@ -4023,7 +4023,9 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter, tx_ring->next_to_clean = i; - netdev_completed_queue(netdev, pkts_compl, bytes_compl); + if (!adapter->ecdev) { + netdev_completed_queue(netdev, pkts_compl, bytes_compl); + } #define TX_WAKE_THRESHOLD 32 if (!adapter->ecdev && unlikely(count && netif_carrier_ok(netdev) &&