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/netgraph/ng_fec.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/netgraph/ng_fec.c')
| -rw-r--r-- | sys/netgraph/ng_fec.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c index 84b3e8f..463aeb1 100644 --- a/sys/netgraph/ng_fec.c +++ b/sys/netgraph/ng_fec.c @@ -637,7 +637,7 @@ ng_fec_tick(void *arg) } ifp = priv->ifp; - if (ifp->if_flags & IFF_RUNNING) + if (ifp->if_drv_flags & IFF_DRV_RUNNING) priv->fec_ch = timeout(ng_fec_tick, priv, hz); return; @@ -704,7 +704,7 @@ ng_fec_ioctl(struct ifnet *ifp, u_long command, caddr_t data) * If it is marked down and running, then stop it. */ if (ifr->ifr_flags & IFF_UP) { - if (!(ifp->if_flags & IFF_RUNNING)) { + if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { /* Sanity. */ if (b->fec_ifcnt == 1 || b->fec_ifcnt == 3) { printf("fec%d: invalid bundle " @@ -713,8 +713,8 @@ ng_fec_ioctl(struct ifnet *ifp, u_long command, caddr_t data) error = EINVAL; break; } - ifp->if_flags &= ~(IFF_OACTIVE); - ifp->if_flags |= IFF_RUNNING; + ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE); + ifp->if_drv_flags |= IFF_DRV_RUNNING; ng_fec_init(ifp); } /* @@ -727,8 +727,9 @@ ng_fec_ioctl(struct ifnet *ifp, u_long command, caddr_t data) priv->if_flags = ifp->if_flags; } } else { - if (ifp->if_flags & IFF_RUNNING) - ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE); + if (ifp->if_drv_flags & IFF_DRV_RUNNING) + ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | + IFF_DRV_OACTIVE); ng_fec_stop(ifp); } break; @@ -834,7 +835,8 @@ ng_fec_output(struct ifnet *ifp, struct mbuf *m, int error; /* Check interface flags */ - if ((ifp->if_flags & (IFF_UP|IFF_RUNNING)) != (IFF_UP|IFF_RUNNING)) { + if (!((ifp->if_flags & IFF_UP) && + (ifp->if_drv_flags & IFF_DRV_RUNNING))) { m_freem(m); return (ENETDOWN); } |
