diff options
author | brooks <brooks@FreeBSD.org> | 2003-10-30 19:45:58 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2003-10-30 19:45:58 +0000 |
commit | 38e31120fcd40193d407e469c46607ecc302ab68 (patch) | |
tree | 7d01fdeb4d415c1bae5c7bd03a9a32e71d3a786d /sys/dev/xe | |
parent | 24760267308bc1cdadffe3933510627f1a8ebec9 (diff) | |
download | FreeBSD-src-38e31120fcd40193d407e469c46607ecc302ab68.zip FreeBSD-src-38e31120fcd40193d407e469c46607ecc302ab68.tar.gz |
There is no way to enter the attach routine twice with the same softc
without a detach call in between so don't try to deal with that
possiability.
This is a diff-reduction commit for the upcoming if_xname conversion.
Diffstat (limited to 'sys/dev/xe')
-rw-r--r-- | sys/dev/xe/if_xe.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c index 3a6175a..6158e7d 100644 --- a/sys/dev/xe/if_xe.c +++ b/sys/dev/xe/if_xe.c @@ -218,22 +218,20 @@ xe_attach (device_t dev) scp->autoneg_status = XE_AUTONEG_NONE; /* Initialise the ifnet structure */ - if (!scp->ifp->if_name) { - scp->ifp->if_softc = scp; - scp->ifp->if_name = "xe"; - scp->ifp->if_unit = device_get_unit(dev); - scp->ifp->if_timer = 0; - scp->ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); - scp->ifp->if_linkmib = &scp->mibdata; - scp->ifp->if_linkmiblen = sizeof scp->mibdata; - scp->ifp->if_output = ether_output; - scp->ifp->if_start = xe_start; - scp->ifp->if_ioctl = xe_ioctl; - scp->ifp->if_watchdog = xe_watchdog; - scp->ifp->if_init = xe_init; - scp->ifp->if_baudrate = 100000000; - scp->ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; - } + scp->ifp->if_softc = scp; + scp->ifp->if_name = "xe"; + scp->ifp->if_unit = device_get_unit(dev); + scp->ifp->if_timer = 0; + scp->ifp->if_flags = (IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); + scp->ifp->if_linkmib = &scp->mibdata; + scp->ifp->if_linkmiblen = sizeof scp->mibdata; + scp->ifp->if_output = ether_output; + scp->ifp->if_start = xe_start; + scp->ifp->if_ioctl = xe_ioctl; + scp->ifp->if_watchdog = xe_watchdog; + scp->ifp->if_init = xe_init; + scp->ifp->if_baudrate = 100000000; + scp->ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; /* Initialise the ifmedia structure */ ifmedia_init(scp->ifm, 0, xe_media_change, xe_media_status); |