From owner-svn-src-stable@FreeBSD.ORG Tue Nov 5 06:48:13 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 8B049649; Tue, 5 Nov 2013 06:48:13 +0000 (UTC) (envelope-from yongari@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 790772F8E; Tue, 5 Nov 2013 06:48:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA56mDqI039987; Tue, 5 Nov 2013 06:48:13 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA56mDwH039986; Tue, 5 Nov 2013 06:48:13 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201311050648.rA56mDwH039986@svn.freebsd.org> From: Pyun YongHyeon Date: Tue, 5 Nov 2013 06:48:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r257687 - stable/10/sys/dev/msk X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Nov 2013 06:48:13 -0000 Author: yongari Date: Tue Nov 5 06:48:12 2013 New Revision: 257687 URL: http://svnweb.freebsd.org/changeset/base/257687 Log: MFC r257490: Perform media change after setting IFF_DRV_RUNNING flag. Without it, driver would ignore the first link state update if controller already established a link. Approved by: re (glebius) Modified: stable/10/sys/dev/msk/if_msk.c Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/msk/if_msk.c ============================================================================== --- stable/10/sys/dev/msk/if_msk.c Tue Nov 5 06:44:33 2013 (r257686) +++ stable/10/sys/dev/msk/if_msk.c Tue Nov 5 06:48:12 2013 (r257687) @@ -4070,12 +4070,12 @@ msk_init_locked(struct msk_if_softc *sc_ CSR_WRITE_4(sc, B0_IMSK, sc->msk_intrmask); CSR_READ_4(sc, B0_IMSK); - sc_if->msk_flags &= ~MSK_FLAG_LINK; - mii_mediachg(mii); - ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + sc_if->msk_flags &= ~MSK_FLAG_LINK; + mii_mediachg(mii); + callout_reset(&sc_if->msk_tick_ch, hz, msk_tick, sc_if); }