diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-06-17 23:58:11 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-06-26 11:21:17 +0200 |
| commit | 3d58d7f053eae83b59baf5c8b8a58da78653f605 (patch) | |
| tree | f0a09f8cd34e718b40cd804e1256362c1e811570 /target/linux/ar71xx/files | |
| parent | 26b8db253745b0591bfffa21f02323428f11a88f (diff) | |
| download | upstream-3d58d7f053eae83b59baf5c8b8a58da78653f605.tar.gz upstream-3d58d7f053eae83b59baf5c8b8a58da78653f605.tar.bz2 upstream-3d58d7f053eae83b59baf5c8b8a58da78653f605.zip | |
ar71xx: prevent spurious ethernet resets from dma hang check false positives
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx/files')
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 2 | ||||
| -rw-r--r-- | target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h index 5d03dcf2bd..898bde1d25 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h @@ -174,7 +174,7 @@ struct ag71xx { unsigned int desc_pktlen_mask; unsigned int rx_buf_size; - struct work_struct restart_work; + struct delayed_work restart_work; struct delayed_work link_work; struct timer_list oom_timer; diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index d7c27393a6..65bc89eb0d 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -908,12 +908,12 @@ static void ag71xx_tx_timeout(struct net_device *dev) if (netif_msg_tx_err(ag)) pr_info("%s: tx timeout\n", ag->dev->name); - schedule_work(&ag->restart_work); + schedule_delayed_work(&ag->restart_work, 1); } static void ag71xx_restart_work_func(struct work_struct *work) { - struct ag71xx *ag = container_of(work, struct ag71xx, restart_work); + struct ag71xx *ag = container_of(work, struct ag71xx, restart_work.work); rtnl_lock(); ag71xx_hw_disable(ag); @@ -966,7 +966,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush) if (!flush && !ag71xx_desc_empty(desc)) { if (pdata->is_ar724x && ag71xx_check_dma_stuck(ag, ring->buf[i].timestamp)) - schedule_work(&ag->restart_work); + schedule_delayed_work(&ag->restart_work, HZ / 2); break; } @@ -1002,6 +1002,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush) netdev_completed_queue(ag->dev, sent, bytes_compl); if ((ring->curr - ring->dirty) < (ring_size * 3) / 4) netif_wake_queue(ag->dev); + cancel_delayed_work(&ag->restart_work); return sent; } @@ -1321,7 +1322,7 @@ static int ag71xx_probe(struct platform_device *pdev) dev->netdev_ops = &ag71xx_netdev_ops; dev->ethtool_ops = &ag71xx_ethtool_ops; - INIT_WORK(&ag->restart_work, ag71xx_restart_work_func); + INIT_DELAYED_WORK(&ag->restart_work, ag71xx_restart_work_func); init_timer(&ag->oom_timer); ag->oom_timer.data = (unsigned long) dev; |