diff options
Diffstat (limited to 'drivers/usb/net')
-rw-r--r-- | drivers/usb/net/catc.c | 2 | ||||
-rw-r--r-- | drivers/usb/net/kaweth.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/pegasus.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/rtl8150.c | 1 | ||||
-rw-r--r-- | drivers/usb/net/usbnet.c | 2 | ||||
-rw-r--r-- | drivers/usb/net/zd1201.c | 1 |
6 files changed, 0 insertions, 8 deletions
diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c index c8be912f24e1..37ef365a2472 100644 --- a/drivers/usb/net/catc.c +++ b/drivers/usb/net/catc.c | |||
@@ -383,7 +383,6 @@ static void catc_tx_done(struct urb *urb, struct pt_regs *regs) | |||
383 | 383 | ||
384 | if (urb->status == -ECONNRESET) { | 384 | if (urb->status == -ECONNRESET) { |
385 | dbg("Tx Reset."); | 385 | dbg("Tx Reset."); |
386 | urb->transfer_flags &= ~URB_ASYNC_UNLINK; | ||
387 | urb->status = 0; | 386 | urb->status = 0; |
388 | catc->netdev->trans_start = jiffies; | 387 | catc->netdev->trans_start = jiffies; |
389 | catc->stats.tx_errors++; | 388 | catc->stats.tx_errors++; |
@@ -445,7 +444,6 @@ static void catc_tx_timeout(struct net_device *netdev) | |||
445 | struct catc *catc = netdev_priv(netdev); | 444 | struct catc *catc = netdev_priv(netdev); |
446 | 445 | ||
447 | warn("Transmit timed out."); | 446 | warn("Transmit timed out."); |
448 | catc->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
449 | usb_unlink_urb(catc->tx_urb); | 447 | usb_unlink_urb(catc->tx_urb); |
450 | } | 448 | } |
451 | 449 | ||
diff --git a/drivers/usb/net/kaweth.c b/drivers/usb/net/kaweth.c index 7ffa99b9760f..e04b0ce3611a 100644 --- a/drivers/usb/net/kaweth.c +++ b/drivers/usb/net/kaweth.c | |||
@@ -787,7 +787,6 @@ static int kaweth_start_xmit(struct sk_buff *skb, struct net_device *net) | |||
787 | kaweth_usb_transmit_complete, | 787 | kaweth_usb_transmit_complete, |
788 | kaweth); | 788 | kaweth); |
789 | kaweth->end = 0; | 789 | kaweth->end = 0; |
790 | kaweth->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
791 | 790 | ||
792 | if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC))) | 791 | if((res = usb_submit_urb(kaweth->tx_urb, GFP_ATOMIC))) |
793 | { | 792 | { |
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c index fcd6d3ccef44..7484d34780fc 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/usb/net/pegasus.c | |||
@@ -825,7 +825,6 @@ static void pegasus_tx_timeout(struct net_device *net) | |||
825 | pegasus_t *pegasus = netdev_priv(net); | 825 | pegasus_t *pegasus = netdev_priv(net); |
826 | if (netif_msg_timer(pegasus)) | 826 | if (netif_msg_timer(pegasus)) |
827 | printk(KERN_WARNING "%s: tx timeout\n", net->name); | 827 | printk(KERN_WARNING "%s: tx timeout\n", net->name); |
828 | pegasus->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
829 | usb_unlink_urb(pegasus->tx_urb); | 828 | usb_unlink_urb(pegasus->tx_urb); |
830 | pegasus->stats.tx_errors++; | 829 | pegasus->stats.tx_errors++; |
831 | } | 830 | } |
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c index 59ab40ebb394..c3d4e3589e30 100644 --- a/drivers/usb/net/rtl8150.c +++ b/drivers/usb/net/rtl8150.c | |||
@@ -653,7 +653,6 @@ static void rtl8150_tx_timeout(struct net_device *netdev) | |||
653 | { | 653 | { |
654 | rtl8150_t *dev = netdev_priv(netdev); | 654 | rtl8150_t *dev = netdev_priv(netdev); |
655 | warn("%s: Tx timeout.", netdev->name); | 655 | warn("%s: Tx timeout.", netdev->name); |
656 | dev->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
657 | usb_unlink_urb(dev->tx_urb); | 656 | usb_unlink_urb(dev->tx_urb); |
658 | dev->stats.tx_errors++; | 657 | dev->stats.tx_errors++; |
659 | } | 658 | } |
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 4682696450db..3c6eef4168e5 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c | |||
@@ -2987,7 +2987,6 @@ static void rx_submit (struct usbnet *dev, struct urb *urb, unsigned flags) | |||
2987 | 2987 | ||
2988 | usb_fill_bulk_urb (urb, dev->udev, dev->in, | 2988 | usb_fill_bulk_urb (urb, dev->udev, dev->in, |
2989 | skb->data, size, rx_complete, skb); | 2989 | skb->data, size, rx_complete, skb); |
2990 | urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
2991 | 2990 | ||
2992 | spin_lock_irqsave (&dev->rxq.lock, lockflags); | 2991 | spin_lock_irqsave (&dev->rxq.lock, lockflags); |
2993 | 2992 | ||
@@ -3561,7 +3560,6 @@ static int usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) | |||
3561 | 3560 | ||
3562 | usb_fill_bulk_urb (urb, dev->udev, dev->out, | 3561 | usb_fill_bulk_urb (urb, dev->udev, dev->out, |
3563 | skb->data, skb->len, tx_complete, skb); | 3562 | skb->data, skb->len, tx_complete, skb); |
3564 | urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
3565 | 3563 | ||
3566 | /* don't assume the hardware handles USB_ZERO_PACKET | 3564 | /* don't assume the hardware handles USB_ZERO_PACKET |
3567 | * NOTE: strictly conforming cdc-ether devices should expect | 3565 | * NOTE: strictly conforming cdc-ether devices should expect |
diff --git a/drivers/usb/net/zd1201.c b/drivers/usb/net/zd1201.c index fc013978837e..c4e479ee926a 100644 --- a/drivers/usb/net/zd1201.c +++ b/drivers/usb/net/zd1201.c | |||
@@ -847,7 +847,6 @@ static void zd1201_tx_timeout(struct net_device *dev) | |||
847 | return; | 847 | return; |
848 | dev_warn(&zd->usb->dev, "%s: TX timeout, shooting down urb\n", | 848 | dev_warn(&zd->usb->dev, "%s: TX timeout, shooting down urb\n", |
849 | dev->name); | 849 | dev->name); |
850 | zd->tx_urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
851 | usb_unlink_urb(zd->tx_urb); | 850 | usb_unlink_urb(zd->tx_urb); |
852 | zd->stats.tx_errors++; | 851 | zd->stats.tx_errors++; |
853 | /* Restart the timeout to quiet the watchdog: */ | 852 | /* Restart the timeout to quiet the watchdog: */ |