diff options
| author | Camelia Groza <camelia.groza@nxp.com> | 2017-09-11 09:14:46 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-09-25 07:25:49 (GMT) |
| commit | 4f4f8a909a6610abf0844feab011fcedd3a60014 (patch) | |
| tree | 631326a90a7cdc159322b81091e0c548cf34c03f /drivers/net/ethernet/freescale/sdk_dpaa | |
| parent | 2949daa11fa5671ac8d1902d75ba78653525d7a5 (diff) | |
| download | linux-4f4f8a909a6610abf0844feab011fcedd3a60014.tar.xz | |
sdk_dpaa: update the xmit timestamp to avoid watchdog timeouts
[dpaa part]
Update txq0's trans_start in order to prevent the netdev watchdog from
triggering too quickly. Since we set the LLTX flag, the stack won't update
the jiffies for other tx queues. Prevent the watchdog from checking the
other tx queues by adding the NETIF_HW_ACCEL_MQ flag.
Signed-off-by: Camelia Groza <camelia.groza@nxp.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/sdk_dpaa')
| -rw-r--r-- | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c index e59261b..7026f91 100644 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth.c @@ -772,6 +772,9 @@ static int dpa_private_netdev_init(struct net_device *net_dev) /* Advertise GRO support */ net_dev->features |= NETIF_F_GRO; + /* Advertise NETIF_F_HW_ACCEL_MQ to avoid Tx timeout warnings */ + net_dev->features |= NETIF_F_HW_ACCEL_MQ; + return dpa_netdev_init(net_dev, mac_addr, tx_timeout); } diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c index 8f1bb87..7324e84 100644 --- a/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c +++ b/drivers/net/ethernet/freescale/sdk_dpaa/dpaa_eth_sg.c @@ -1140,6 +1140,7 @@ int __hot dpa_tx_extended(struct sk_buff *skb, struct net_device *net_dev, if (unlikely(dpa_xmit(priv, percpu_stats, &fd, egress_fq, conf_fq) < 0)) goto xmit_failed; + netif_trans_update(net_dev); return NETDEV_TX_OK; xmit_failed: |