diff options
| author | brooks <brooks@FreeBSD.org> | 2005-06-14 17:47:31 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2005-06-14 17:47:31 +0000 |
| commit | 63219d9727ad7b591409cd3663a47ed7c8e34171 (patch) | |
| tree | 0df7877d503f0e034951ab83b14256950b6e4eec /sys | |
| parent | 670888f81f1add9282d44fd44d9bd5c4519f1bf5 (diff) | |
| download | FreeBSD-src-63219d9727ad7b591409cd3663a47ed7c8e34171.zip FreeBSD-src-63219d9727ad7b591409cd3663a47ed7c8e34171.tar.gz | |
Move if_alloc() higher in the attach function so sc->ifp is populated
early. I've moved it all the way to the top rather than part way up as
the submitter did.
Submitted by: Jung-uk Kim <jkim at niksun dot com>
Reported by: submitter, le, dougb
Approved by: re (ifnet blanket)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/if_ndis/if_ndis.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c index a9e960c..2504592 100644 --- a/sys/dev/if_ndis/if_ndis.c +++ b/sys/dev/if_ndis/if_ndis.c @@ -467,6 +467,12 @@ ndis_attach(dev) int i; sc = device_get_softc(dev); + ifp = sc->ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + error = ENOSPC; + goto fail; + } + ifp->if_softc = sc; mtx_init(&sc->ndis_mtx, "ndis softc lock", MTX_NETWORK_LOCK, MTX_DEF); @@ -612,12 +618,6 @@ ndis_attach(dev) /* Check for task offload support. */ ndis_probe_offload(sc); - ifp = sc->ifp = if_alloc(IFT_ETHER); - if (ifp == NULL) { - error = ENOSPC; - goto fail; - } - ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; |
