diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2018-09-25 07:56:53 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-25 10:28:03 -0700 |
| commit | 4bee64b41701a4ca19df4226f16fc91fc156940a (patch) | |
| tree | 6709b86b1df0872601e07a3851c12598932b8a02 | |
| parent | dpaa2-eth: Make Rx flow hash key configurable (diff) | |
| download | linux-dev-4bee64b41701a4ca19df4226f16fc91fc156940a.tar.xz linux-dev-4bee64b41701a4ca19df4226f16fc91fc156940a.zip | |
r8169: use default watchdog timeout
The networking core has a default watchdog timeout of 5s. I see no
need to define an own timeout of 6s which is basically the same.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 1843fafb62d1..dd5822673ddb 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -77,8 +77,6 @@ static const int multicast_filter_limit = 32; #define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc)) #define R8169_RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc)) -#define RTL8169_TX_TIMEOUT (6*HZ) - /* write/read MMIO register */ #define RTL_W8(tp, reg, val8) writeb((val8), tp->mmio_addr + (reg)) #define RTL_W16(tp, reg, val16) writew((val16), tp->mmio_addr + (reg)) @@ -7414,7 +7412,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->dev_addr[i] = RTL_R8(tp, MAC0 + i); dev->ethtool_ops = &rtl8169_ethtool_ops; - dev->watchdog_timeo = RTL8169_TX_TIMEOUT; netif_napi_add(dev, &tp->napi, rtl8169_poll, NAPI_POLL_WEIGHT); |