aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/renesas
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2013-06-20 17:13:42 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-24 03:10:21 -0400
commit4eb313a7a939a983c525648227b5fe0a9d41679f (patch)
treeedd6f21e3ce428d0828a2023f2e65f58c827c788 /drivers/net/ethernet/renesas
parentca8c35852138ee0585eaffe6b9f10a5261ea7771 (diff)
sh_eth: fix misreporting of transmit abort
Due to obviously missing braces, EESR.TABT (transmit abort) interrupt may be reported even if it hasn't happened, just when EESR.TWB (transmit descriptor write-back) interrupt happens. Luckily (?), EESR.TWB is disabled by the driver via the TRIMD register and all the interrupt masks, so that transmit abort is never actually logged... Put the braces where they should be and fix the incoherent comment, while at it. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/renesas')
-rw-r--r--drivers/net/ethernet/renesas/sh_eth.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index d9c21dd596d7..e29fe8dbd226 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1552,11 +1552,12 @@ static void sh_eth_error(struct net_device *ndev, int intr_status)
1552 1552
1553ignore_link: 1553ignore_link:
1554 if (intr_status & EESR_TWB) { 1554 if (intr_status & EESR_TWB) {
1555 /* Write buck end. unused write back interrupt */ 1555 /* Unused write back interrupt */
1556 if (intr_status & EESR_TABT) /* Transmit Abort int */ 1556 if (intr_status & EESR_TABT) { /* Transmit Abort int */
1557 ndev->stats.tx_aborted_errors++; 1557 ndev->stats.tx_aborted_errors++;
1558 if (netif_msg_tx_err(mdp)) 1558 if (netif_msg_tx_err(mdp))
1559 dev_err(&ndev->dev, "Transmit Abort\n"); 1559 dev_err(&ndev->dev, "Transmit Abort\n");
1560 }
1560 } 1561 }
1561 1562
1562 if (intr_status & EESR_RABT) { 1563 if (intr_status & EESR_RABT) {