diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2016-03-13 23:09:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-17 00:24:58 +0100 |
| commit | ad846aa52ca7b7ec6b99a8b13c4ce0bbe7b15b7f (patch) | |
| tree | 8f1ef6640c1646ce1dde715a8ead707210914b24 /drivers/net | |
| parent | bnx2x: don't wait for Tx completion on recovery (diff) | |
| download | linux-ad846aa52ca7b7ec6b99a8b13c4ce0bbe7b15b7f.tar.xz linux-ad846aa52ca7b7ec6b99a8b13c4ce0bbe7b15b7f.zip | |
sh_eth: do not call netif_start_queue() from sh_eth_dev_init()
Iff sh_eth_phy_start() call fails in sh_eth_open(), the netif_start_queue()
call done by sh_eth_dev_init() is not undone. In order to deal with that,
stop calling netif_start_queue() from there, so that it can be called only
when the device is fully opened and sh_eth_dev_init() only deals with the
hardware initialization, symmetrically to sh_eth_dev_exit()...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
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, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 8385d927adc3..004e2d7560fd 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1312,8 +1312,6 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start) if (start) { /* Setting the Rx mode will start the Rx process. */ sh_eth_write(ndev, EDRRR_R, EDRRR); - - netif_start_queue(ndev); } return ret; @@ -2261,6 +2259,8 @@ static int sh_eth_open(struct net_device *ndev) if (ret) goto out_free_irq; + netif_start_queue(ndev); + mdp->is_opened = 1; return ret; @@ -2304,6 +2304,8 @@ static void sh_eth_tx_timeout(struct net_device *ndev) /* device init */ sh_eth_dev_init(ndev, true); + + netif_start_queue(ndev); } /* Packet transmit function */ |