vserver 1.9.3

[linux-2.6.git] / drivers / net / irda / irda-usb.c

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 6ae10e5..62f9853 100644 (file)
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -268,7 +268,6 @@ static void irda_usb_change_speed_xbofs(struct irda_usb_cb *self)
                       speed_bulk_callback, self);
        urb->transfer_buffer_length = USB_IRDA_HEADER;
        urb->transfer_flags = URB_ASYNC_UNLINK;
-       urb->timeout = msecs_to_jiffies(100);
 
        /* Irq disabled -> GFP_ATOMIC */
        if ((ret = usb_submit_urb(urb, GFP_ATOMIC))) {
@@ -411,8 +410,6 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
         * after each of our packets that is exact multiple of the frame size.
         * This is how the dongle will detect the end of packet - Jean II */
        urb->transfer_flags |= URB_ZERO_PACKET;
-       /* Timeout need to be shorter than NET watchdog timer */
-       urb->timeout = msecs_to_jiffies(200);
 
        /* Generate min turn time. FIXME: can we do better than this? */
        /* Trying to a turnaround time at this level is trying to measure