diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2005-08-25 05:01:24 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2005-08-25 05:01:24 +0000 |
| commit | a4a8a0bc4b3a0a932b574e32955bb582ad954f27 (patch) | |
| tree | 6f867a0a960e0fd2203dc6ea98d72ee7517f87ed /sys/dev/cx | |
| parent | 1fd4ce4b9d36036231eff64ca2a05996c889715e (diff) | |
Notes
Diffstat (limited to 'sys/dev/cx')
| -rw-r--r-- | sys/dev/cx/if_cx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c index 7b0425e412ea..2d75f97a9d5c 100644 --- a/sys/dev/cx/if_cx.c +++ b/sys/dev/cx/if_cx.c @@ -1090,7 +1090,7 @@ static int cx_sioctl (struct ifnet *ifp, u_long cmd, caddr_t data) return EBUSY; /* Socket ioctls on slave subchannels are not allowed. */ - was_up = (ifp->if_flags & IFF_RUNNING) != 0; + was_up = (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0; error = sppp_ioctl (ifp, cmd, data); if (error) return error; @@ -1111,7 +1111,7 @@ static int cx_sioctl (struct ifnet *ifp, u_long cmd, caddr_t data) /* We get here only in case of SIFFLAGS or SIFADDR. */ s = splhigh (); CX_LOCK (bd); - should_be_up = (ifp->if_flags & IFF_RUNNING) != 0; + should_be_up = (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0; if (!was_up && should_be_up) { /* Interface goes up -- start it. */ cx_up (d); @@ -1207,7 +1207,7 @@ static void cx_send (drv_t *d) #endif } #ifndef NETGRAPH - d->ifp->if_flags |= IFF_OACTIVE; + d->ifp->if_drv_flags |= IFF_DRV_OACTIVE; #endif } @@ -1275,7 +1275,7 @@ static void cx_transmit (cx_chan_t *c, void *attachment, int len) d->timeout = 0; #else ++d->ifp->if_opackets; - d->ifp->if_flags &= ~IFF_OACTIVE; + d->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; d->ifp->if_timer = 0; #endif cx_start (d); @@ -1435,7 +1435,7 @@ static void cx_error (cx_chan_t *c, int data) d->timeout = 0; #else ++d->ifp->if_oerrors; - d->ifp->if_flags &= ~IFF_OACTIVE; + d->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; d->ifp->if_timer = 0; cx_start (d); #endif @@ -1654,7 +1654,7 @@ static int cx_ioctl (struct cdev *dev, u_long cmd, caddr_t data, int flag, struc return error; if (c->mode == M_ASYNC) return EBUSY; - if (d->ifp->if_flags & IFF_RUNNING) + if (d->ifp->if_drv_flags & IFF_DRV_RUNNING) return EBUSY; if (! strcmp ("cisco", (char*)data)) { IFP2SP(d->ifp)->pp_flags &= ~(PP_FR); |