aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2016-05-14 14:55:49 +0900
committerDavid S. Miller <davem@davemloft.net>2016-05-16 13:55:49 -0400
commit7d6da453efce17fae35707fa7e5757e7ade8b3cc (patch)
tree0c9aa7ef2dbc90364b5fa27b45c4e4c1bfa8eb0d /drivers/net/ethernet
parentnet: w5100: fix MAC filtering for W5500 (diff)
downloadlinux-dev-7d6da453efce17fae35707fa7e5757e7ade8b3cc.tar.xz
linux-dev-7d6da453efce17fae35707fa7e5757e7ade8b3cc.zip
net: w5100: increase TX timeout period
This increases TX timeout period from one second to 5 seconds which is the default value if the driver doesn't explicitly set net_device->watchdog_timeo. The one second timeout is too short for W5100 with SPI interface mode which doesn't support burst READ/WRITE processing in the SPI transfer. If the packet is transmitted while RX packets are being received at a very high rate, the TX transmittion work in the workqueue is delayed and the watchdog timer is expired. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Cc: Mike Sinkovsky <msink@permonline.ru> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/wiznet/w5100.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index 7c6d5081242e..21bef2ca2ac0 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -1142,7 +1142,6 @@ int w5100_probe(struct device *dev, const struct w5100_ops *ops,
ndev->netdev_ops = &w5100_netdev_ops;
ndev->ethtool_ops = &w5100_ethtool_ops;
- ndev->watchdog_timeo = HZ;
netif_napi_add(ndev, &priv->napi, w5100_napi_poll, 16);
/* This chip doesn't support VLAN packets with normal MTU,