diff options
| author | hayeswang <hayeswang@realtek.com> | 2015-07-29 20:39:09 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-30 14:03:46 -0700 |
| commit | 37608f3e57dda037a230afb7dc8da9a63f100e06 (patch) | |
| tree | 8644b530646ae8e4880f81caa2f11bf4d812402f | |
| parent | e501139a515018f913761d3bf4239313c87e721c (diff) | |
| download | linux-37608f3e57dda037a230afb7dc8da9a63f100e06.tar.gz linux-37608f3e57dda037a230afb7dc8da9a63f100e06.tar.bz2 linux-37608f3e57dda037a230afb7dc8da9a63f100e06.zip | |
r8152: reset device when tx timeout
The device reset is necessary if the hw becomes abnormal and stops
transmitting packets.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/r8152.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index e1b6d6d67768..ad8cbc6c9ee7 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -27,7 +27,7 @@ #include <linux/usb/cdc.h> /* Version Information */ -#define DRIVER_VERSION "v1.08.0 (2015/01/13)" +#define DRIVER_VERSION "v1.08.1 (2015/07/28)" #define DRIVER_AUTHOR "Realtek linux nic maintainers <nic_swsd@realtek.com>" #define DRIVER_DESC "Realtek RTL8152/RTL8153 Based USB Ethernet Adapters" #define MODULENAME "r8152" @@ -1902,11 +1902,10 @@ static void rtl_drop_queued_tx(struct r8152 *tp) static void rtl8152_tx_timeout(struct net_device *netdev) { struct r8152 *tp = netdev_priv(netdev); - int i; netif_warn(tp, tx_err, netdev, "Tx timeout\n"); - for (i = 0; i < RTL8152_MAX_TX; i++) - usb_unlink_urb(tp->tx_info[i].urb); + + usb_queue_reset_device(tp->intf); } static void rtl8152_set_rx_mode(struct net_device *netdev) |