aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2014-09-19 11:32:23 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-24 01:33:19 -0400
commit37ebb54915dc42944f6ae92fe53b9531c3903801 (patch)
tree5e81856de30454af836ff583ec96e3a34591c312 /drivers/net/usb
parent59d48b3f1fdf307115af38b91c3ea4ddb57b73a2 (diff)
usb: hub: rename khubd to hub_wq in documentation and comments
USB hub has started to use a workqueue instead of kthread. Let's update the documentation and comments here and there. This patch mostly just replaces "khubd" with "hub_wq". There are only few exceptions where the whole sentence was updated. These more complicated changes can be found in the following files: Documentation/usb/hotplug.txt drivers/net/usb/usbnet.c drivers/usb/core/hcd.c drivers/usb/host/ohci-hcd.c drivers/usb/host/xhci.c Signed-off-by: Petr Mladek <pmladek@suse.cz> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/usbnet.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 5173821a9575..20615bbd693b 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -69,8 +69,9 @@
69// reawaken network queue this soon after stopping; else watchdog barks 69// reawaken network queue this soon after stopping; else watchdog barks
70#define TX_TIMEOUT_JIFFIES (5*HZ) 70#define TX_TIMEOUT_JIFFIES (5*HZ)
71 71
72// throttle rx/tx briefly after some faults, so khubd might disconnect() 72/* throttle rx/tx briefly after some faults, so hub_wq might disconnect()
73// us (it polls at HZ/4 usually) before we report too many false errors. 73 * us (it polls at HZ/4 usually) before we report too many false errors.
74 */
74#define THROTTLE_JIFFIES (HZ/8) 75#define THROTTLE_JIFFIES (HZ/8)
75 76
76// between wakeups 77// between wakeups
@@ -595,9 +596,9 @@ static void rx_complete (struct urb *urb)
595 "rx shutdown, code %d\n", urb_status); 596 "rx shutdown, code %d\n", urb_status);
596 goto block; 597 goto block;
597 598
598 /* we get controller i/o faults during khubd disconnect() delays. 599 /* we get controller i/o faults during hub_wq disconnect() delays.
599 * throttle down resubmits, to avoid log floods; just temporarily, 600 * throttle down resubmits, to avoid log floods; just temporarily,
600 * so we still recover when the fault isn't a khubd delay. 601 * so we still recover when the fault isn't a hub_wq delay.
601 */ 602 */
602 case -EPROTO: 603 case -EPROTO:
603 case -ETIME: 604 case -ETIME:
@@ -1185,8 +1186,9 @@ static void tx_complete (struct urb *urb)
1185 case -ESHUTDOWN: // hardware gone 1186 case -ESHUTDOWN: // hardware gone
1186 break; 1187 break;
1187 1188
1188 // like rx, tx gets controller i/o faults during khubd delays 1189 /* like rx, tx gets controller i/o faults during hub_wq
1189 // and so it uses the same throttling mechanism. 1190 * delays and so it uses the same throttling mechanism.
1191 */
1190 case -EPROTO: 1192 case -EPROTO:
1191 case -ETIME: 1193 case -ETIME:
1192 case -EILSEQ: 1194 case -EILSEQ: