diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-01 12:53:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-01 12:53:59 -0500 |
| commit | 6107dbdb64465848e310b85ebe589236e24a9680 (patch) | |
| tree | 93e3f203282ea27a332bb640541c5c3e3fd5319f /drivers/net | |
| parent | 889711a03e0fba427fb85317900e93c74e3be02a (diff) | |
| parent | 0cf45a3b1e2c47bbcc9e75cbed5c660492e297da (diff) | |
Merge branch 'sh_eth-fixes-for-MagicPacket-handling'
Niklas Söderlund says:
====================
sh_eth: fixes for MagicPacket handling
This series contain two fixes for MagicPacket handling. It's based on
top of net-next and is tested on Koelsch.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 2f08d2735fe2..54248775f227 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1605,6 +1605,8 @@ static void sh_eth_emac_interrupt(struct net_device *ndev) sh_eth_write(ndev, felic_stat, ECSR); /* clear int */ if (felic_stat & ECSR_ICD) ndev->stats.tx_carrier_errors++; + if (felic_stat & ECSR_MPD) + pm_wakeup_event(&mdp->pdev->dev, 0); if (felic_stat & ECSR_LCHNG) { /* Link Changed */ if (mdp->cd->no_psr || mdp->no_ether_link) @@ -1624,8 +1626,6 @@ static void sh_eth_emac_interrupt(struct net_device *ndev) sh_eth_rcv_snd_enable(ndev); } } - if (felic_stat & ECSR_MPD) - pm_wakeup_event(&mdp->pdev->dev, 0); } /* error control function */ @@ -3271,7 +3271,7 @@ static int sh_eth_wol_setup(struct net_device *ndev) sh_eth_write(ndev, EESIPR_ECIIP, EESIPR); /* Enable MagicPacket */ - sh_eth_modify(ndev, ECMR, 0, ECMR_MPDE); + sh_eth_modify(ndev, ECMR, ECMR_MPDE, ECMR_MPDE); /* Increased clock usage so device won't be suspended */ clk_enable(mdp->clk); |