[PATCH net-drivers-2.6 8/10] e1000: Report failure code when loopback test fails
From: Malli Chilakala <hidden>
Date: 2005-02-15 21:31:06
8 Report failure code when loopback test fails Signed-off-by: Mallikarjuna R Chilakala <redacted> Signed-off-by: Ganesh Venkatesan <redacted> Signed-off-by: John Ronciak <redacted> diff -up net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c
--- net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c 2005-02-01 23:10:24.985106488 -0800
+++ net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c 2005-02-01 23:10:26.421888064 -0800@@ -1310,7 +1310,7 @@ e1000_run_loopback_test(struct e1000_ada struct e1000_desc_ring *txdr = &adapter->test_tx_ring; struct e1000_desc_ring *rxdr = &adapter->test_rx_ring; struct pci_dev *pdev = adapter->pdev; - int i; + int i, ret_val; E1000_WRITE_REG(&adapter->hw, RDT, rxdr->count - 1);
@@ -1330,11 +1330,12 @@ e1000_run_loopback_test(struct e1000_ada rxdr->buffer_info[i].length, PCI_DMA_FROMDEVICE); - if (!e1000_check_lbtest_frame(rxdr->buffer_info[i++].skb, 1024)) - return 0; - } while (i < 64); + ret_val = e1000_check_lbtest_frame(rxdr->buffer_info[i].skb, + 1024); + i++; + } while (ret_val != 0 && i < 64); - return 13; + return ret_val; } static int