| To: | "jgarzik@xxxxxxxxx" <jgarzik@xxxxxxxxx> |
|---|---|
| Subject: | [PATCH net-drivers-2.4 8/10] e1000: Report failure code when loopback test fails |
| From: | Malli Chilakala <mallikarjuna.chilakala@xxxxxxxxx> |
| Date: | Tue, 15 Feb 2005 13:35:49 -0800 (PST) |
| Cc: | netdev <netdev@xxxxxxxxxxx> |
| Replyto: | "Malli Chilakala" <mallikarjuna.chilakala@xxxxxxxxx> |
| Sender: | netdev-bounce@xxxxxxxxxxx |
8 Report failure code when loopback test fails
Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@xxxxxxxxx>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@xxxxxxxxx>
Signed-off-by: John Ronciak <john.ronciak@xxxxxxxxx>
diff -up net-drivers-2.4/drivers/net/e1000/e1000_ethtool.c
net-drivers-2.4/drivers/net/e1000.new/e1000_ethtool.c
--- net-drivers-2.4/drivers/net/e1000/e1000_ethtool.c 2005-02-01
23:21:49.119102312 -0800
+++ net-drivers-2.4/drivers/net/e1000.new/e1000_ethtool.c 2005-02-01
23:21:50.368912312 -0800
@@ -1309,7 +1309,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);
@@ -1329,11 +1331,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
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | [PATCH net-drivers-2.4 7/10] e1000: Checks for desc ring/rx data bufs spanning 64k boundary, Malli Chilakala |
|---|---|
| Next by Date: | [PATCH net-drivers-2.4 9/10] e1000: Fixes related to Cable length estimation, Malli Chilakala |
| Previous by Thread: | [PATCH net-drivers-2.4 7/10] e1000: Checks for desc ring/rx data bufs spanning 64k boundary, Malli Chilakala |
| Next by Thread: | [PATCH net-drivers-2.4 9/10] e1000: Fixes related to Cable length estimation, Malli Chilakala |
| Indexes: | [Date] [Thread] [Top] [All Lists] |