From owner-svn-src-all@FreeBSD.ORG  Tue Jan 20 16:30:03 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E2B2B6A0;
 Tue, 20 Jan 2015 16:30:03 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CF780837;
 Tue, 20 Jan 2015 16:30:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0KGU3bs097971;
 Tue, 20 Jan 2015 16:30:03 GMT (envelope-from br@FreeBSD.org)
Received: (from br@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0KGU31c097969;
 Tue, 20 Jan 2015 16:30:03 GMT (envelope-from br@FreeBSD.org)
Message-Id: <201501201630.t0KGU31c097969@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: br set sender to br@FreeBSD.org
 using -f
From: Ruslan Bukin <br@FreeBSD.org>
Date: Tue, 20 Jan 2015 16:30:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277422 - head/sys/dev/usb/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2015 16:30:04 -0000

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;
 	}