From 3b18775820d0883dc3b698e48721b7cedbac20d7 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 18 Nov 2009 14:07:15 +0000 Subject: [PATCH] --- yaml --- r: 175245 b: refs/heads/master c: d97aabcd0ea6dd3375747b1e02b9164c4064880d h: refs/heads/master i: 175243: 3e624d84704eb0acd619ea6b92fca70874f33b78 v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x_adapter.h | 3 --- trunk/drivers/staging/et131x/et131x_isr.c | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a66140b18838..f6db1709d5f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f838cabdb27a7f3c28c186360865cf5118c469a6 +refs/heads/master: d97aabcd0ea6dd3375747b1e02b9164c4064880d diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h index ed35f8afdd41..3f7f37a56b6c 100644 --- a/trunk/drivers/staging/et131x/et131x_adapter.h +++ b/trunk/drivers/staging/et131x/et131x_adapter.h @@ -213,9 +213,6 @@ struct et131x_adapter { u32 MCAddressCount; u8 MCList[NIC_MAX_MCAST_LIST][ETH_ALEN]; - /* MAC test */ - u32 TxMacTest; - /* Pointer to the device's PCI register space */ ADDRESS_MAP_t __iomem *regs; diff --git a/trunk/drivers/staging/et131x/et131x_isr.c b/trunk/drivers/staging/et131x/et131x_isr.c index 486abe47dfc7..3aeac7b92281 100644 --- a/trunk/drivers/staging/et131x/et131x_isr.c +++ b/trunk/drivers/staging/et131x/et131x_isr.c @@ -337,10 +337,9 @@ void et131x_isr_handler(struct work_struct *work) */ /* TRAP();*/ - etdev->TxMacTest = readl(&iomem->txmac.tx_test); dev_warn(&etdev->pdev->dev, "RxDMA_ERR interrupt, error %x\n", - etdev->TxMacTest); + readl(&iomem->txmac.tx_test)); } /* Handle the Wake on LAN Event */