bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed repeating e1000e reset while link down, thanks to J. Kunz.

This commit is contained in:
Florian Pose 2013-02-05 13:56:29 +01:00
parent b0564237b2
commit 016eb52267
7 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devices/e1000e/netdev-2.6.32-ethercat.c
View File

@ -3810,8 +3810,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
if (tx_pending) {

3
devices/e1000e/netdev-2.6.33-ethercat.c
View File

@ -3799,8 +3799,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
if (tx_pending) {

3
devices/e1000e/netdev-2.6.34-ethercat.c
View File

@ -3775,8 +3775,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
if (tx_pending) {

3
devices/e1000e/netdev-2.6.35-ethercat.c
View File

@ -4192,8 +4192,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
if (tx_pending) {

3
devices/e1000e/netdev-2.6.37-ethercat.c
View File

@ -4382,8 +4382,7 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && !netif_carrier_ok(netdev))) {
if (!adapter->ecdev && !netif_carrier_ok(netdev)) {
tx_pending = (e1000_desc_unused(tx_ring) + 1 <
tx_ring->count);
if (tx_pending) {

5
devices/e1000e/netdev-3.2-ethercat.c
View File

@ -4546,9 +4546,8 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && (!netif_carrier_ok(netdev) &&
(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)))) {
if (!adapter->ecdev && !netif_carrier_ok(netdev) &&
(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
/*
* We've lost link, so the controller stops DMA,
* but we've got queued Tx work that's never going

5
devices/e1000e/netdev-3.4-ethercat.c
View File

@ -4681,9 +4681,8 @@ link_up:
e1000e_update_adaptive(&adapter->hw);
if ((adapter->ecdev && !ecdev_get_link(adapter->ecdev))
|| (!adapter->ecdev && (!netif_carrier_ok(netdev) &&
(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)))) {
if (!adapter->ecdev && !netif_carrier_ok(netdev) &&
(e1000_desc_unused(tx_ring) + 1 < tx_ring->count)) {
/*
* We've lost link, so the controller stops DMA,
* but we've got queued Tx work that's never going