# HG changeset patch # User Florian Pose # Date 1424355569 -3600 # Node ID 4b0b906df1b40a1b5610282117b2c22581890575 # Parent 792892ab4806a91e2103fda31dd69f06369b1de7 Fixed bug concerning netdev_completed_queue(); thanks to B. Benner. diff -r 792892ab4806 -r 4b0b906df1b4 devices/e1000/e1000_main-3.10-ethercat.c --- a/devices/e1000/e1000_main-3.10-ethercat.c Tue Oct 28 16:54:59 2014 +0100 +++ b/devices/e1000/e1000_main-3.10-ethercat.c Thu Feb 19 15:19:29 2015 +0100 @@ -4004,7 +4004,9 @@ 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 -r 792892ab4806 -r 4b0b906df1b4 devices/e1000/e1000_main-3.12-ethercat.c --- a/devices/e1000/e1000_main-3.12-ethercat.c Tue Oct 28 16:54:59 2014 +0100 +++ b/devices/e1000/e1000_main-3.12-ethercat.c Thu Feb 19 15:19:29 2015 +0100 @@ -4004,7 +4004,9 @@ 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 -r 792892ab4806 -r 4b0b906df1b4 devices/e1000/e1000_main-3.14-ethercat.c --- a/devices/e1000/e1000_main-3.14-ethercat.c Tue Oct 28 16:54:59 2014 +0100 +++ b/devices/e1000/e1000_main-3.14-ethercat.c Thu Feb 19 15:19:29 2015 +0100 @@ -3982,7 +3982,9 @@ 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 -r 792892ab4806 -r 4b0b906df1b4 devices/e1000/e1000_main-3.16-ethercat.c --- a/devices/e1000/e1000_main-3.16-ethercat.c Tue Oct 28 16:54:59 2014 +0100 +++ b/devices/e1000/e1000_main-3.16-ethercat.c Thu Feb 19 15:19:29 2015 +0100 @@ -3974,7 +3974,9 @@ 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 -r 792892ab4806 -r 4b0b906df1b4 devices/e1000/e1000_main-3.8-ethercat.c --- a/devices/e1000/e1000_main-3.8-ethercat.c Tue Oct 28 16:54:59 2014 +0100 +++ b/devices/e1000/e1000_main-3.8-ethercat.c Thu Feb 19 15:19:29 2015 +0100 @@ -4023,7 +4023,9 @@ 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) &&