Set a flag if the interrupt URB completes with ENOENT as this
occurs legitimately during system suspend. When the
usbnet_resume is called, test this flag and try once to resubmit
the interrupt URB.
This version of the patch moves the urb submit directly into
usbnet_resume. Is it okay to submit a GFP_KERNEL urb from
usbnet_resume()?
Signed-off-by: Paul Stewart <pstew@xxxxxxxxxxxx>
---
drivers/net/usb/usbnet.c | 13 ++++++++++++-
include/linux/usb/usbnet.h | 1 +
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 02d25c7..3651a48 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -482,6 +482,7 @@ static void intr_complete (struct urb *urb)
case -ESHUTDOWN: /* hardware gone */
if (netif_msg_ifdown (dev))
devdbg (dev, "intr shutdown, code %d", status);
+ set_bit(EVENT_INTR_HALT, &dev->flags);
return;
/* NOTE: not throttling like RX/TX, since this endpoint
@@ -1294,9 +1295,19 @@ int usbnet_resume (struct usb_interface *intf)
{
struct usbnet *dev = usb_get_intfdata(intf);
- if (!--dev->suspend_count)
+ if (!--dev->suspend_count) {
tasklet_schedule (&dev->bh);
+ /* resubmit interrupt URB if it was halted by suspend */
+ if (dev->interrupt && netif_running(dev->net) &&
+ netif_device_present(dev->net) &&
+ test_bit(EVENT_INTR_HALT, &dev->flags)) {
+ clear_bit(EVENT_INTR_HALT, &dev->flags);
+ usb_submit_urb(dev->interrupt, GFP_KERNEL);
+ }
+ }
+}
+
return 0;
}
EXPORT_SYMBOL_GPL(usbnet_resume);
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index ba09fe8..6c4b5f8 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -64,6 +64,7 @@ struct usbnet {
# define EVENT_RX_MEMORY 2
# define EVENT_STS_SPLIT 3
# define EVENT_LINK_RESET 4
+# define EVENT_INTR_HALT 5
};
static inline struct usb_driver *driver_of(struct usb_interface *intf)
--
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
