Deleted Added
full compact
38c38
< __FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 148654 2005-08-03 00:18:35Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 148887 2005-08-09 10:20:02Z rwatson $");
45c45
< __FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 148654 2005-08-03 00:18:35Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/dev/txp/if_txp.c 148887 2005-08-09 10:20:02Z rwatson $");
95c95
< "$FreeBSD: head/sys/dev/txp/if_txp.c 148654 2005-08-03 00:18:35Z rwatson $";
---
> "$FreeBSD: head/sys/dev/txp/if_txp.c 148887 2005-08-09 10:20:02Z rwatson $";
814c814
< if (!(ifp->if_flags & IFF_RUNNING))
---
> if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
887c887
< ifp->if_flags &= ~IFF_OACTIVE;
---
> ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
1081c1081
< if (ifp->if_flags & IFF_RUNNING)
---
> if (ifp->if_drv_flags & IFF_DRV_RUNNING)
1181c1181
< if (ifp->if_flags & IFF_RUNNING)
---
> if (ifp->if_drv_flags & IFF_DRV_RUNNING)
1215,1216c1215,1216
< ifp->if_flags |= IFF_RUNNING;
< ifp->if_flags &= ~IFF_OACTIVE;
---
> ifp->if_drv_flags |= IFF_DRV_RUNNING;
> ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
1279c1279,1280
< if ((ifp->if_flags & (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
---
> if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
> IFF_DRV_RUNNING)
1365c1366
< ifp->if_flags |= IFF_OACTIVE;
---
> ifp->if_drv_flags |= IFF_DRV_OACTIVE;
1583c1584
< ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
---
> ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);