Patchwork [2/2] sh_eth: fix misreporting of transmit abort

login
register
mail settings
Submitter Sergei Shtylyov
Date June 20, 2013, 9:13 p.m.
Message ID <201306210113.43087.sergei.shtylyov@cogentembedded.com>
Download mbox | patch
Permalink /patch/253081/
State Accepted
Delegated to: David Miller
Headers show

Comments

Sergei Shtylyov - June 20, 2013, 9:13 p.m.
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>

---
The patch is against Dave Miller's 'net.git' repo. Maybe it should be merged to
the 'net-next.git' repo instead, it's up to Dave to decide. The same can be said
about whether this should be merged to -stable...

 drivers/net/ethernet/renesas/sh_eth.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - June 24, 2013, 7:10 a.m.
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Date: Fri, 21 Jun 2013 01:13:42 +0400

> 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>

Also applied to 'net'.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: net/drivers/net/ethernet/renesas/sh_eth.c
===================================================================
--- net.orig/drivers/net/ethernet/renesas/sh_eth.c
+++ net/drivers/net/ethernet/renesas/sh_eth.c
@@ -1550,11 +1550,12 @@  static void sh_eth_error(struct net_devi
 
 ignore_link:
 	if (intr_status & EESR_TWB) {
-		/* Write buck end. unused write back interrupt */
-		if (intr_status & EESR_TABT)	/* Transmit Abort int */
+		/* Unused write back interrupt */
+		if (intr_status & EESR_TABT) {	/* Transmit Abort int */
 			ndev->stats.tx_aborted_errors++;
 			if (netif_msg_tx_err(mdp))
 				dev_err(&ndev->dev, "Transmit Abort\n");
+		}
 	}
 
 	if (intr_status & EESR_RABT) {