From owner-svn-src-projects@FreeBSD.ORG Wed Mar 25 21:57:04 2015 Return-Path: Delivered-To: svn-src-projects@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 5984343C; Wed, 25 Mar 2015 21:57:04 +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 450E6977; Wed, 25 Mar 2015 21:57:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2PLv4ev026490; Wed, 25 Mar 2015 21:57:04 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2PLv4GS026489; Wed, 25 Mar 2015 21:57:04 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201503252157.t2PLv4GS026489@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 25 Mar 2015 21:57:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280638 - projects/ifnet/sys/dev/cadence X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2015 21:57:04 -0000 Author: glebius Date: Wed Mar 25 21:57:03 2015 New Revision: 280638 URL: https://svnweb.freebsd.org/changeset/base/280638 Log: Call if_attach() at the very end of cgem_attach() after all possible failure scenarios. Modified: projects/ifnet/sys/dev/cadence/if_cgem.c Modified: projects/ifnet/sys/dev/cadence/if_cgem.c ============================================================================== --- projects/ifnet/sys/dev/cadence/if_cgem.c Wed Mar 25 21:55:13 2015 (r280637) +++ projects/ifnet/sys/dev/cadence/if_cgem.c Wed Mar 25 21:57:03 2015 (r280638) @@ -1659,14 +1659,6 @@ cgem_attach(device_t dev) sc->rxbufs = DEFAULT_NUM_RX_BUFS; sc->rxhangwar = 1; - /* Disable hardware checksumming by default. */ - ifat.ifat_hwassist = 0; - ifat.ifat_capenable = sc->cgem_capenable = IFCAP_VLAN_MTU; - ifat.ifat_softc = sc; - ifat.ifat_dunit = device_get_unit(dev); - ifat.ifat_lla = eaddr; - sc->ifp = if_attach(&ifat); - /* Set up TX and RX descriptor area. */ err = cgem_setup_descs(sc); if (err) { @@ -1691,6 +1683,14 @@ cgem_attach(device_t dev) cgem_add_sysctls(dev); + /* Disable hardware checksumming by default. */ + ifat.ifat_hwassist = 0; + ifat.ifat_capenable = sc->cgem_capenable = IFCAP_VLAN_MTU; + ifat.ifat_softc = sc; + ifat.ifat_dunit = device_get_unit(dev); + ifat.ifat_lla = eaddr; + sc->ifp = if_attach(&ifat); + return (0); }