usbnet whitespace fixes (18ab458f) · Commits · 戴 / test

drivers/net/usb/usbnet.c

+39 −37

Original line number	Diff line number	Diff line
		@@ -393,7 +393,7 @@ static void rx_complete (struct urb *urb)
		entry->urb = NULL;

		switch (urb_status) {
		// success
		/* success */
		case 0:
		if (skb->len < dev->net->hard_header_len) {
		entry->state = rx_cleanup;
		@@ -404,25 +404,27 @@ static void rx_complete (struct urb *urb)
		}
		break;

		// stalls need manual reset. this is rare ... except that
		// when going through USB 2.0 TTs, unplug appears this way.
		// we avoid the highspeed version of the ETIMEOUT/EILSEQ
		// storm, recovering as needed.
		/* stalls need manual reset. this is rare ... except that
		* when going through USB 2.0 TTs, unplug appears this way.
		* we avoid the highspeed version of the ETIMEOUT/EILSEQ
		* storm, recovering as needed.
		*/
		case -EPIPE:
		dev->stats.rx_errors++;
		usbnet_defer_kevent (dev, EVENT_RX_HALT);
		// FALLTHROUGH

		// software-driven interface shutdown
		case -ECONNRESET: // async unlink
		case -ESHUTDOWN: // hardware gone
		/* software-driven interface shutdown */
		case -ECONNRESET: /* async unlink */
		case -ESHUTDOWN: /* hardware gone */
		if (netif_msg_ifdown (dev))
		devdbg (dev, "rx shutdown, code %d", urb_status);
		goto block;

		// we get controller i/o faults during khubd disconnect() delays.
		// throttle down resubmits, to avoid log floods; just temporarily,
		// so we still recover when the fault isn't a khubd delay.
		/* we get controller i/o faults during khubd disconnect() delays.
		* throttle down resubmits, to avoid log floods; just temporarily,
		* so we still recover when the fault isn't a khubd delay.
		*/
		case -EPROTO:
		case -ETIME:
		case -EILSEQ:
		@@ -438,7 +440,7 @@ block:
		urb = NULL;
		break;

		// data overrun ... flush fifo?
		/* data overrun ... flush fifo? */
		case -EOVERFLOW:
		dev->stats.rx_over_errors++;
		// FALLTHROUGH
		@@ -477,8 +479,8 @@ static void intr_complete (struct urb *urb)
		break;

		/* software-driven interface shutdown */
		case -ENOENT: // urb killed
		case -ESHUTDOWN: // hardware gone
		case -ENOENT: /* urb killed */
		case -ESHUTDOWN: /* hardware gone */
		if (netif_msg_ifdown (dev))
		devdbg (dev, "intr shutdown, code %d", status);
		return;
		@@ -569,9 +571,9 @@ static int usbnet_stop (struct net_device *net)
		temp = unlink_urbs (dev, &dev->txq) + unlink_urbs (dev, &dev->rxq);

		// maybe wait for deletions to finish.
		while (!skb_queue_empty(&dev->rxq) &&
		!skb_queue_empty(&dev->txq) &&
		!skb_queue_empty(&dev->done)) {
		while (!skb_queue_empty(&dev->rxq)
		&& !skb_queue_empty(&dev->txq)
		&& !skb_queue_empty(&dev->done)) {
		msleep(UNLINK_TIMEOUT_MS);
		if (netif_msg_ifdown (dev))
		devdbg (dev, "waited for %d urb completions", temp);

drivers/net/usb/usbnet.h

+5 −5

File changed.

Contains only whitespace changes.

Admin message