Commit 49dd48da authored Apr 10, 2016 by Sergei Shtylyov Committed by David S. Miller Apr 09, 2016

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



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 <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 183c948a

drivers/net/ethernet/renesas/sh_eth.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}