Date: Wed, 25 Mar 2015 21:57:04 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280638 - projects/ifnet/sys/dev/cadence Message-ID: <201503252157.t2PLv4GS026489@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503252157.t2PLv4GS026489>