sh_eth: re-enable-E-MAC interrupts in sh_eth_set_ringparam()

Sergei Shtylyov · davem330 · commit 49dd48dafec6 · 2016-04-09T21:27:04.000-04:00
The E-MAC interrupts are left disabled when the ring parameters are changed
via 'ethtool'. In order to fix this, it's enough to call sh_eth_dev_init()
with 'true' instead of 'false' for the second argument (which conveniently
allows us to remove the following code re-enabling E-DMAC interrupts and
reception).

Signed-off-by: Sergei Shtylyov &lt;sergei.shtylyov@cogentembedded.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2194,17 +2194,13 @@ static int sh_eth_set_ringparam(struct net_device *ndev,
 				   __func__);
 			return ret;
 		}
-		ret = sh_eth_dev_init(ndev, false);
+		ret = sh_eth_dev_init(ndev, true);
 		if (ret < 0) {
 			netdev_err(ndev, "%s: sh_eth_dev_init failed.\n",
 				   __func__);
 			return ret;
 		}
 
-		mdp->irq_enabled = true;
-		sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);
-		/* Setting the Rx mode will start the Rx process. */
-		sh_eth_write(ndev, EDRRR_R, EDRRR);
 		netif_device_attach(ndev);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -2194,17 +2194,13 @@ static int sh_eth_set_ringparam(struct net_device *ndev,`
`2194`	`2194`	`__func__);`
`2195`	`2195`	`return ret;`
`2196`	`2196`	`}`
`2197`		`- ret = sh_eth_dev_init(ndev, false);`
	`2197`	`+ ret = sh_eth_dev_init(ndev, true);`
`2198`	`2198`	`if (ret < 0) {`
`2199`	`2199`	`netdev_err(ndev, "%s: sh_eth_dev_init failed.\n",`
`2200`	`2200`	`__func__);`
`2201`	`2201`	`return ret;`
`2202`	`2202`	`}`
`2203`	`2203`
`2204`		`- mdp->irq_enabled = true;`
`2205`		`- sh_eth_write(ndev, mdp->cd->eesipr_value, EESIPR);`
`2206`		`- /* Setting the Rx mode will start the Rx process. */`
`2207`		`- sh_eth_write(ndev, EDRRR_R, EDRRR);`
`2208`	`2204`	`netif_device_attach(ndev);`
`2209`	`2205`	`}`
`2210`	`2206`