Date: Tue, 20 Jan 2015 16:30:03 +0000 (UTC) From: Ruslan Bukin <br@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277422 - head/sys/dev/usb/net Message-ID: <201501201630.t0KGU31c097969@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: br Date: Tue Jan 20 16:30:02 2015 New Revision: 277422 URL: https://svnweb.freebsd.org/changeset/base/277422 Log: o Restore 'goto tr_setup;' when operating in host mode mistakenly removed in r277414. o Remove extra parentheses around cases. Modified: head/sys/dev/usb/net/if_cdce.c Modified: head/sys/dev/usb/net/if_cdce.c ============================================================================== --- head/sys/dev/usb/net/if_cdce.c Tue Jan 20 16:21:59 2015 (r277421) +++ head/sys/dev/usb/net/if_cdce.c Tue Jan 20 16:30:02 2015 (r277422) @@ -860,9 +860,8 @@ tr_setup: if (usbd_get_mode(sc->sc_ue.ue_udev) == USB_MODE_HOST) { /* try to clear stall first */ usbd_xfer_set_stall(xfer); - } else { - goto tr_setup; } + goto tr_setup; } break; } @@ -1069,8 +1068,7 @@ tr_setup: /* start clear stall */ if (usbd_get_mode(sc->sc_ue.ue_udev) == USB_MODE_HOST) usbd_xfer_set_stall(xfer); - else - goto tr_setup; + goto tr_setup; } break; } @@ -1093,10 +1091,10 @@ cdce_intr_write_callback(struct usb_xfer DPRINTF("Transferred %d bytes\n", actlen); switch (sc->sc_notify_state) { - case (CDCE_NOTIFY_NETWORK_CONNECTION): + case CDCE_NOTIFY_NETWORK_CONNECTION: sc->sc_notify_state = CDCE_NOTIFY_SPEED_CHANGE; break; - case (CDCE_NOTIFY_SPEED_CHANGE): + case CDCE_NOTIFY_SPEED_CHANGE: sc->sc_notify_state = CDCE_NOTIFY_DONE; break; default: @@ -1155,9 +1153,8 @@ tr_setup: if (usbd_get_mode(sc->sc_ue.ue_udev) == USB_MODE_HOST) { /* start clear stall */ usbd_xfer_set_stall(xfer); - } else { - goto tr_setup; } + goto tr_setup; } break; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501201630.t0KGU31c097969>