diff options
| author | rwatson <rwatson@FreeBSD.org> | 2005-08-09 10:20:02 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2005-08-09 10:20:02 +0000 |
| commit | 5d770a09e85126b8b3e9fe302c36350a90210cbe (patch) | |
| tree | bb70e59641e2310a3c26ec449af5ab0cb7420d9d /sys/dev/ppbus/if_plip.c | |
| parent | 74759aaa78777146f23aa05c856f574efdfb41d9 (diff) | |
| download | FreeBSD-src-5d770a09e85126b8b3e9fe302c36350a90210cbe.zip FreeBSD-src-5d770a09e85126b8b3e9fe302c36350a90210cbe.tar.gz | |
Propagate rename of IFF_OACTIVE and IFF_RUNNING to IFF_DRV_OACTIVE and
IFF_DRV_RUNNING, as well as the move from ifnet.if_flags to
ifnet.if_drv_flags. Device drivers are now responsible for
synchronizing access to these flags, as they are in if_drv_flags. This
helps prevent races between the network stack and device driver in
maintaining the interface flags field.
Many __FreeBSD__ and __FreeBSD_version checks maintained and continued;
some less so.
Reviewed by: pjd, bz
MFC after: 7 days
Diffstat (limited to 'sys/dev/ppbus/if_plip.c')
| -rw-r--r-- | sys/dev/ppbus/if_plip.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c index 59bb5d6..8a35336 100644 --- a/sys/dev/ppbus/if_plip.c +++ b/sys/dev/ppbus/if_plip.c @@ -321,16 +321,18 @@ lpioctl (struct ifnet *ifp, u_long cmd, caddr_t data) ifp->if_flags |= IFF_UP; /* FALLTHROUGH */ case SIOCSIFFLAGS: - if ((!(ifp->if_flags & IFF_UP)) && (ifp->if_flags & IFF_RUNNING)) { + if ((!(ifp->if_flags & IFF_UP)) && + (ifp->if_drv_flags & IFF_DRV_RUNNING)) { ppb_wctr(ppbus, 0x00); - ifp->if_flags &= ~IFF_RUNNING; + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; /* IFF_UP is not set, try to release the bus anyway */ ppb_release_bus(ppbus, dev); break; } - if (((ifp->if_flags & IFF_UP)) && (!(ifp->if_flags & IFF_RUNNING))) { + if (((ifp->if_flags & IFF_UP)) && + (!(ifp->if_drv_flags & IFF_DRV_RUNNING))) { /* XXX * Should the request be interruptible? @@ -362,7 +364,7 @@ lpioctl (struct ifnet *ifp, u_long cmd, caddr_t data) } ppb_wctr(ppbus, IRQENABLE); - ifp->if_flags |= IFF_RUNNING; + ifp->if_drv_flags |= IFF_DRV_RUNNING; } break; @@ -577,7 +579,7 @@ lp_intr (void *arg) if (sc->sc_iferrs > LPMAXERRS) { printf("lp%d: Too many errors, Going off-line.\n", device_get_unit(dev)); ppb_wctr(ppbus, 0x00); - sc->sc_ifp->if_flags &= ~IFF_RUNNING; + sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING; sc->sc_iferrs=0; } @@ -615,7 +617,7 @@ lpoutput (struct ifnet *ifp, struct mbuf *m, /* We need a sensible value if we abort */ cp++; - ifp->if_flags |= IFF_RUNNING; + ifp->if_drv_flags |= IFF_DRV_RUNNING; err = 1; /* assume we're aborting because of an error */ |
