From owner-svn-src-head@FreeBSD.ORG Sun Nov 28 00:57:49 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4986A1065670; Sun, 28 Nov 2010 00:57:49 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 37EDA8FC15; Sun, 28 Nov 2010 00:57:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAS0vn8h027475; Sun, 28 Nov 2010 00:57:49 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAS0vnHS027473; Sun, 28 Nov 2010 00:57:49 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201011280057.oAS0vnHS027473@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 28 Nov 2010 00:57:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215962 - head/sys/dev/usb/net X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Nov 2010 00:57:49 -0000 Author: yongari Date: Sun Nov 28 00:57:48 2010 New Revision: 215962 URL: http://svn.freebsd.org/changeset/base/215962 Log: Move axe_reset() to axe_init(). Modified: head/sys/dev/usb/net/if_axe.c Modified: head/sys/dev/usb/net/if_axe.c ============================================================================== --- head/sys/dev/usb/net/if_axe.c Sun Nov 28 00:53:43 2010 (r215961) +++ head/sys/dev/usb/net/if_axe.c Sun Nov 28 00:57:48 2010 (r215962) @@ -1022,6 +1022,8 @@ axe_init(struct usb_ether *ue) /* Cancel pending I/O */ axe_stop(ue); + axe_reset(sc); + /* Set MAC address. */ if (sc->sc_flags & (AXE_FLAG_178 | AXE_FLAG_772)) axe_cmd(sc, AXE_178_CMD_WRITE_NODEID, 0, 0, IF_LLADDR(ifp)); @@ -1110,6 +1112,4 @@ axe_stop(struct usb_ether *ue) */ usbd_transfer_stop(sc->sc_xfer[AXE_BULK_DT_WR]); usbd_transfer_stop(sc->sc_xfer[AXE_BULK_DT_RD]); - - axe_reset(sc); }