summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/r8152_shield.c
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2014-07-02 23:55:48 -0400
committerVladislav Zhurba <vzhurba@nvidia.com>2018-02-01 16:58:00 -0500
commit232826eb58ac3be7f81f8a822bc232a91a0a7675 (patch)
tree566e6da9ab4a5c8902fc55933875541637b83c71 /drivers/net/usb/r8152_shield.c
parent459de17d561c6c4f13e808621049177d4f0c5b14 (diff)
r8152: increase the tx timeout
When the system is too busy to complete the urb, the tx timout function would be called. This causes the other tx urbs would be killed, too. Increase the tx timeout to avoid it. From http://git.kernel.org/cgit/linux/kernel/git/davem/net.git/commit/?id=b8125404c242a6336eacaa54047b27cfd3fee68e Change-Id: I5604dca925c50ee71a30ce1c97893adc68dd21a9 Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from upstream commit b8125404c242a6336eacaa54047b27cfd3fee68e) Signed-off-by: Aly Hirani <ahirani@nvidia.com> Reviewed-on: http://git-master/r/553392 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Diffstat (limited to 'drivers/net/usb/r8152_shield.c')
-rw-r--r--drivers/net/usb/r8152_shield.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/r8152_shield.c b/drivers/net/usb/r8152_shield.c
index 1c206bec9..10e114d0e 100644
--- a/drivers/net/usb/r8152_shield.c
+++ b/drivers/net/usb/r8152_shield.c
@@ -442,7 +442,7 @@ enum rtl_register_content {
442#define BYTE_EN_END_MASK 0xf0 442#define BYTE_EN_END_MASK 0xf0
443 443
444#define RTL8152_RMS (VLAN_ETH_FRAME_LEN + VLAN_HLEN) 444#define RTL8152_RMS (VLAN_ETH_FRAME_LEN + VLAN_HLEN)
445#define RTL8152_TX_TIMEOUT (HZ) 445#define RTL8152_TX_TIMEOUT (5 * HZ)
446 446
447/* rtl8152 flags */ 447/* rtl8152 flags */
448enum rtl8152_flags { 448enum rtl8152_flags {