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

2 files changed, 50 insertions, 0 deletions

diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index df57f27..e9d9107 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -289,7 +289,11 @@ fwe_stop(struct fwe_softc *fwe)
 		fwe->dma_ch = -1;
 	}
 
+#if defined(__FreeBSD__)
+	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+#else
 	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+#endif
 }
 
 static int
@@ -404,8 +408,13 @@ found:
 	if ((xferq->flag & FWXFERQ_RUNNING) == 0)
 		fc->irx_enable(fc, fwe->dma_ch);
 
+#if defined(__FreeBSD__)
+	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+#else
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
+#endif
 
 	FWE_POLL_REGISTER(fwe_poll, fwe, ifp);
 #if 0
@@ -426,10 +435,18 @@ fwe_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		case SIOCSIFFLAGS:
 			s = splimp();
 			if (ifp->if_flags & IFF_UP) {
+#if defined(__FreeBSD__)
+				if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
+#else
 				if (!(ifp->if_flags & IFF_RUNNING))
+#endif
 					fwe_init(&fwe->eth_softc);
 			} else {
+#if defined(__FreeBSD__)
+				if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+#else
 				if (ifp->if_flags & IFF_RUNNING)
+#endif
 					fwe_stop(fwe);
 			}
 			/* XXX keep promiscoud mode */
@@ -525,12 +542,20 @@ fwe_start(struct ifnet *ifp)
 	}
 
 	s = splimp();
+#if defined(__FreeBSD__)
+	ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+#else
 	ifp->if_flags |= IFF_OACTIVE;
+#endif
 
 	if (ifp->if_snd.ifq_len != 0)
 		fwe_as_output(fwe, ifp);
 
+#if defined(__FreeBSD__)
+	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+#else
 	ifp->if_flags &= ~IFF_OACTIVE;
+#endif
 	splx(s);
 }
 
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 3d12ad2..9fcfac6 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -269,7 +269,11 @@ fwip_stop(struct fwip_softc *fwip)
 		fwip->dma_ch = -1;
 	}
 
+#if defined(__FreeBSD__)
+	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+#else
 	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
+#endif
 }
 
 static int
@@ -397,8 +401,13 @@ found:
 	if ((xferq->flag & FWXFERQ_RUNNING) == 0)
 		fc->irx_enable(fc, fwip->dma_ch);
 
+#if defined(__FreeBSD__)
+	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+#else
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
+#endif
 
 	FWIP_POLL_REGISTER(fwip_poll, fwip, ifp);
 #if 0
@@ -417,10 +426,18 @@ fwip_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFFLAGS:
 		s = splimp();
 		if (ifp->if_flags & IFF_UP) {
+#if defined(__FreeBSD__)
+			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
+#else
 			if (!(ifp->if_flags & IFF_RUNNING))
+#endif
 				fwip_init(&fwip->fw_softc);
 		} else {
+#if defined(__FreeBSD__)
+			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+#else
 			if (ifp->if_flags & IFF_RUNNING)
+#endif
 				fwip_stop(fwip);
 		}
 		splx(s);
@@ -536,12 +553,20 @@ fwip_start(struct ifnet *ifp)
 	}
 
 	s = splimp();
+#if defined(__FreeBSD__)
+	ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+#else
 	ifp->if_flags |= IFF_OACTIVE;
+#endif
 
 	if (ifp->if_snd.ifq_len != 0)
 		fwip_async_output(fwip, ifp);
 
+#if defined(__FreeBSD__)
+	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+#else
 	ifp->if_flags &= ~IFF_OACTIVE;
+#endif
 	splx(s);
 }