Re: rtl8150.c ethernet driver : usb_unlink_urb ->usb_kill_urb
From: Eric Valette
Date: Sat Sep 11 2004 - 12:42:07 EST
Eric Valette wrote:
I'll defer to Petkan as to what to do about this, as he sent me that
patch for a good reason I imagine :)
While we are looking at this driver, here is a way to avoid one full
page of annoying messages at shutdown/module unload.
Signed-off-by: Eric Valette <Eric.Valette@xxxxxxx>
Wrong patch, sorry...
--
__
/ ` Eric Valette
/-- __ o _. 6 rue Paul Le Flem
(___, / (_(_(__ 35740 Pace
Tel: +33 (0)2 99 85 26 76 Fax: +33 (0)2 99 85 26 76
E-mail: eric.valette@xxxxxxx
--- linux/drivers/usb/net/rtl8150.c-2.6.9-rc1-mm4.orig 2004-09-09 11:15:11.000000000 +0200
+++ linux/drivers/usb/net/rtl8150.c 2004-09-11 14:06:44.000000000 +0200
@@ -341,7 +341,7 @@
static int rtl8150_reset(rtl8150_t * dev)
{
- u8 data = 0x11;
+ u8 data = 0x10;
int i = HZ;
set_registers(dev, CR, 1, &data);
@@ -389,10 +389,10 @@
static void unlink_all_urbs(rtl8150_t * dev)
{
- usb_unlink_urb(dev->rx_urb);
- usb_unlink_urb(dev->tx_urb);
- usb_unlink_urb(dev->intr_urb);
- usb_unlink_urb(dev->ctrl_urb);
+ usb_kill_urb(dev->rx_urb);
+ usb_kill_urb(dev->tx_urb);
+ usb_kill_urb(dev->intr_urb);
+ usb_kill_urb(dev->ctrl_urb);
}
static inline struct sk_buff *pull_skb(rtl8150_t *dev)
@@ -656,7 +656,7 @@
rtl8150_t *dev = netdev_priv(netdev);
warn("%s: Tx timeout.", netdev->name);
dev->tx_urb->transfer_flags |= URB_ASYNC_UNLINK;
- usb_unlink_urb(dev->tx_urb);
+ usb_kill_urb(dev->tx_urb);
dev->stats.tx_errors++;
}