From: Hayes Wang <hayeswang@realtek.com>
To: <netdev@vger.kernel.org>
Cc: <nic_swsd@realtek.com>, <linux-kernel@vger.kernel.org>,
<linux-usb@vger.kernel.org>, Hayes Wang <hayeswang@realtek.com>
Subject: [PATCH net v2 2/2] r8152: reset device when tx timeout
Date: Tue, 28 Jul 2015 20:08:42 +0800 [thread overview]
Message-ID: <1394712342-15778-161-Taiwan-albertk@realtek.com> (raw)
In-Reply-To: <1394712342-15778-159-Taiwan-albertk@realtek.com>
The device reset is necessary if the hw becomes abnormal and stops
transmitting packets.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
drivers/net/usb/r8152.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index e1b6d6d..6af299f 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,11 @@ 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);
+ cancel_delayed_work(&tp->schedule);
}
static void rtl8152_set_rx_mode(struct net_device *netdev)
--
2.4.2
next prev parent reply other threads:[~2015-07-28 12:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-28 7:36 [PATCH net 0/2] r8152: device reset Hayes Wang
2015-07-28 7:36 ` [PATCH net 1/2] r8152: add pre_reset and post_reset Hayes Wang
2015-07-28 8:52 ` Oliver Neukum
[not found] ` <1438073562.11934.2.camel-IBi9RG/b67k@public.gmane.org>
2015-07-28 9:52 ` Hayes Wang
2015-07-28 12:05 ` Oliver Neukum
2015-07-28 7:36 ` [PATCH net 2/2] r8152: reset device when tx timeout Hayes Wang
2015-07-28 8:56 ` Oliver Neukum
2015-07-28 9:52 ` Hayes Wang
2015-07-28 12:08 ` [PATCH net v2 0/2] r8152: device reset Hayes Wang
2015-07-28 12:08 ` [PATCH net v2 1/2] r8152: add pre_reset and post_reset Hayes Wang
2015-07-28 12:08 ` Hayes Wang [this message]
2015-07-28 12:14 ` [PATCH net v2 2/2] r8152: reset device when tx timeout Oliver Neukum
2015-07-28 12:31 ` Hayes Wang
2015-07-28 12:58 ` Oliver Neukum
2015-07-29 2:06 ` Hayes Wang
2015-07-29 7:22 ` Oliver Neukum
2015-07-29 11:09 ` Hayes Wang
2015-07-29 12:39 ` [PATCH net v3 0/2] r8152: device reset Hayes Wang
2015-07-29 12:39 ` [PATCH net v3 1/2] r8152: add pre_reset and post_reset Hayes Wang
2015-07-29 12:39 ` [PATCH net v3 2/2] r8152: reset device when tx timeout Hayes Wang
2015-07-30 21:04 ` [PATCH net v3 0/2] r8152: device reset David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394712342-15778-161-Taiwan-albertk@realtek.com \
--to=hayeswang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).