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/i4b | |
| 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/i4b')
| -rw-r--r-- | sys/i4b/driver/i4b_ipr.c | 9 | ||||
| -rw-r--r-- | sys/i4b/driver/i4b_isppp.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c index 1309d73..7fbebc8 100644 --- a/sys/i4b/driver/i4b_ipr.c +++ b/sys/i4b/driver/i4b_ipr.c @@ -444,12 +444,13 @@ i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case SIOCSIFFLAGS: /* set interface flags */ if(!(ifr->ifr_flags & IFF_UP)) { - if(sc->sc_ifp->if_flags & IFF_RUNNING) + if(sc->sc_ifp->if_drv_flags & IFF_DRV_RUNNING) { /* disconnect ISDN line */ i4b_l4_drvrdisc(BDRV_IPR, ifp->if_dunit); - sc->sc_ifp->if_flags &= ~IFF_RUNNING; + sc->sc_ifp->if_drv_flags &= + ~IFF_DRV_RUNNING; } sc->sc_state = ST_IDLE; @@ -594,7 +595,7 @@ ipr_connect(int unit, void *cdp) NDBGL4(L4_DIALST, "ipr%d: setting dial state to ST_CONNECTED", unit); - sc->sc_ifp->if_flags |= IFF_RUNNING; + sc->sc_ifp->if_drv_flags |= IFF_DRV_RUNNING; sc->sc_state = ST_CONNECTED_W; sc->sc_dialresp = DSTAT_NONE; @@ -687,7 +688,7 @@ ipr_disconnect(int unit, void *cdp) sc->sc_dialresp = DSTAT_NONE; sc->sc_lastdialresp = DSTAT_NONE; - sc->sc_ifp->if_flags &= ~IFF_RUNNING; + sc->sc_ifp->if_drv_flags &= ~IFF_DRV_RUNNING; sc->sc_state = ST_IDLE; } diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c index 1cacdea..2d9abe8 100644 --- a/sys/i4b/driver/i4b_isppp.c +++ b/sys/i4b/driver/i4b_isppp.c @@ -280,7 +280,7 @@ i4bisppp_start(struct ifnet *ifp) /* * s = splimp(); - * ifp->if_flags |= IFF_OACTIVE; // - need to clear this somewhere + * ifp->if_drv_flags |= IFF_DRV_OACTIVE; // - need to clear this somewhere * splx(s); */ |
