]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
USB-CDC: called handle_interrupts inside usb_eth_send
authorStefano Babic <sbabic@denx.de>
Sun, 15 Aug 2010 12:19:00 +0000 (14:19 +0200)
committerRemy Bohmer <linux@bohmer.net>
Mon, 20 Sep 2010 19:57:17 +0000 (21:57 +0200)
The patch removes an endless loop  in the usb_eth_send
if the tx_complete is not called before going
in the loop. The driver interrupt routine is called
allowing the driver to check if the TX is completed.

Signed-off-by: Stefano Babic <sbabic@denx.de>
drivers/usb/gadget/ether.c

index 9fc6a369c31ef904232d15057abf322d9e2836e9..29652994742ce5c00d6f3b6ed0d0e5aa4dcc1361 100644 (file)
@@ -1801,6 +1801,8 @@ static int usb_eth_send(struct eth_device* netdev, volatile void* packet, int le
        int                     retval;
        struct usb_request      *req = NULL;
        struct eth_dev          *dev = &l_ethdev;
+       unsigned long ts;
+       unsigned long timeout = USB_CONNECT_TIMEOUT;
 
        debug("%s:...\n", __func__);
 
@@ -1826,6 +1828,8 @@ static int usb_eth_send(struct eth_device* netdev, volatile void* packet, int le
                        ? ((dev->tx_qlen % qmult) != 0) : 0;
 #endif
        dev->tx_qlen=1;
+       ts = get_timer(0);
+       packet_sent = 0;
 
        retval = usb_ep_queue (dev->in_ep, req, GFP_ATOMIC);
 
@@ -1833,7 +1837,11 @@ static int usb_eth_send(struct eth_device* netdev, volatile void* packet, int le
                debug("%s: packet queued\n", __func__);
        while(!packet_sent)
        {
-               packet_sent=0;
+               if (get_timer(ts) > timeout) {
+                       printf("timeout sending packets to usb ethernet\n");
+                       return -1;
+               }
+               usb_gadget_handle_interrupts();
        }
 
        return 0;