From 2b71c8f1007701e813e81ac88df4f2b6d8d019ee Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Mon, 24 Oct 2005 08:06:16 +0000 Subject: [PATCH] - Move DEVICE_POLLING from opt_global.h to opt_polling.h(newly added), so that polling(4) can be enabled in modules that are not built during kernel building - Add opt_polling.h to files that depend on DEVICE_POLLING - Change related netif modules' Makefile to enable polling(4) support - Add comment in net/if_var.h to prevent DEVICE_POLLING related incompatibilities from being introduced Suggested-by: dillon NOTE: As of this commit, any file that will depend on DEVICE_POLLING *must* include opt_polling.h at its beginning With-helps-from: joerg Reviewed-by: dillon, submit@ --- sys/conf/options | 4 ++-- sys/dev/netif/dc/Makefile | 10 ++++++++-- sys/dev/netif/dc/if_dc.c | 4 +++- sys/dev/netif/em/Makefile | 9 +++++++-- sys/dev/netif/em/if_em.c | 4 +++- sys/dev/netif/fwe/Makefile | 9 +++++++-- sys/dev/netif/fwe/if_fwe.c | 3 ++- sys/dev/netif/fxp/Makefile | 10 ++++++++-- sys/dev/netif/fxp/if_fxp.c | 4 +++- sys/dev/netif/nge/Makefile | 10 ++++++++-- sys/dev/netif/nge/if_nge.c | 4 +++- sys/dev/netif/nv/Makefile | 9 +++++++-- sys/dev/netif/nv/if_nv.c | 4 +++- sys/dev/netif/re/Makefile | 9 +++++++-- sys/dev/netif/re/if_re.c | 4 +++- sys/dev/netif/rl/Makefile | 10 ++++++++-- sys/dev/netif/rl/if_rl.c | 4 +++- sys/dev/netif/sis/Makefile | 10 ++++++++-- sys/dev/netif/sis/if_sis.c | 4 +++- sys/dev/netif/vr/Makefile | 10 ++++++++-- sys/dev/netif/vr/if_vr.c | 4 +++- sys/dev/netif/wi/Makefile | 9 +++++++-- sys/dev/netif/wi/if_wi.c | 4 +++- sys/dev/netif/xl/Makefile | 10 ++++++++-- sys/dev/netif/xl/if_xl.c | 4 +++- sys/kern/kern_clock.c | 3 ++- sys/kern/kern_poll.c | 4 +++- sys/net/if.c | 3 ++- sys/net/if_var.h | 12 +++++++++++- 29 files changed, 146 insertions(+), 42 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index 6a62e58aba..4d6bfdce04 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/conf/options,v 1.191.2.53 2003/06/04 17:56:58 sam Exp $ -# $DragonFly: src/sys/conf/options,v 1.41 2005/08/22 18:29:52 joerg Exp $ +# $DragonFly: src/sys/conf/options,v 1.42 2005/10/24 08:06:16 sephe Exp $ # # On the handling of kernel options # @@ -513,7 +513,7 @@ PCFCLOCK_VERBOSE opt_pcfclock.h PCFCLOCK_MAX_RETRIES opt_pcfclock.h # Polling device handling -DEVICE_POLLING opt_global.h +DEVICE_POLLING opt_polling.h # options for ubsec driver UBSEC_DEBUG opt_ubsec.h diff --git a/sys/dev/netif/dc/Makefile b/sys/dev/netif/dc/Makefile index 4ffa5e36b2..c7d75e4fae 100644 --- a/sys/dev/netif/dc/Makefile +++ b/sys/dev/netif/dc/Makefile @@ -1,9 +1,15 @@ # $FreeBSD: src/sys/modules/dc/Makefile,v 1.2 2000/01/28 11:26:28 bde Exp $ -# $DragonFly: src/sys/dev/netif/dc/Makefile,v 1.3 2005/05/31 07:46:17 joerg Exp $ +# $DragonFly: src/sys/dev/netif/dc/Makefile,v 1.4 2005/10/24 08:06:15 sephe Exp $ KMOD = if_dc -SRCS = if_dc.c opt_bdg.h device_if.h bus_if.h pci_if.h +SRCS = if_dc.c device_if.h bus_if.h pci_if.h SRCS += miibus_if.h +SRCS += opt_bdg.h opt_polling.h KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + .include diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index b68677ca2d..aae6959c3a 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ - * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.44 2005/10/12 17:35:51 dillon Exp $ + * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.45 2005/10/24 08:06:15 sephe Exp $ */ /* @@ -88,6 +88,8 @@ * AX88140A doesn't support internal NWAY. */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/em/Makefile b/sys/dev/netif/em/Makefile index be920c887f..db344c5d9a 100644 --- a/sys/dev/netif/em/Makefile +++ b/sys/dev/netif/em/Makefile @@ -1,8 +1,13 @@ #$FreeBSD: src/sys/modules/em/Makefile,v 1.1.2.3 2002/06/18 21:00:56 pdeuskar Exp $ -#$DragonFly: src/sys/dev/netif/em/Makefile,v 1.3 2005/02/17 13:59:36 joerg Exp $ +#$DragonFly: src/sys/dev/netif/em/Makefile,v 1.4 2005/10/24 08:06:15 sephe Exp $ KMOD= if_em SRCS= if_em.c if_em_hw.c -SRCS+= device_if.h bus_if.h pci_if.h opt_bdg.h +SRCS+= device_if.h bus_if.h pci_if.h opt_bdg.h opt_polling.h + +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif .include diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c index 1e0385d4b8..5cad7ac61f 100644 --- a/sys/dev/netif/em/if_em.c +++ b/sys/dev/netif/em/if_em.c @@ -34,7 +34,9 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em.c,v 1.2.2.15 2003/06/09 22:10:15 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.40 2005/10/17 06:18:36 sephe Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.41 2005/10/24 08:06:15 sephe Exp $*/ + +#include "opt_polling.h" #include #include diff --git a/sys/dev/netif/fwe/Makefile b/sys/dev/netif/fwe/Makefile index e754d73c25..758de38ceb 100644 --- a/sys/dev/netif/fwe/Makefile +++ b/sys/dev/netif/fwe/Makefile @@ -1,10 +1,15 @@ # $FreeBSD: src/sys/modules/firewire/fwe/Makefile,v 1.2.2.2 2003/04/28 03:29:19 simokawa Exp $ -# $DragonFly: src/sys/dev/netif/fwe/Makefile,v 1.4 2005/07/28 00:06:09 joerg Exp $ +# $DragonFly: src/sys/dev/netif/fwe/Makefile,v 1.5 2005/10/24 08:06:15 sephe Exp $ # Makefile for the fwe(4) module (Ethernet over IEEE1394) KMOD= if_fwe SRCS= if_fwe.c -SRCS+= bus_if.h device_if.h opt_inet.h +SRCS+= bus_if.h device_if.h opt_inet.h opt_polling.h + +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif .include diff --git a/sys/dev/netif/fwe/if_fwe.c b/sys/dev/netif/fwe/if_fwe.c index c2f3fff8f0..20cc780a7c 100644 --- a/sys/dev/netif/fwe/if_fwe.c +++ b/sys/dev/netif/fwe/if_fwe.c @@ -32,10 +32,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.27 2004/01/08 14:58:09 simokawa Exp $ - * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.19 2005/08/29 10:19:52 sephe Exp $ + * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.20 2005/10/24 08:06:15 sephe Exp $ */ #include "opt_inet.h" +#include "opt_polling.h" #include #include diff --git a/sys/dev/netif/fxp/Makefile b/sys/dev/netif/fxp/Makefile index f48068b1a5..d489c6b6c5 100644 --- a/sys/dev/netif/fxp/Makefile +++ b/sys/dev/netif/fxp/Makefile @@ -1,8 +1,14 @@ # $FreeBSD: src/sys/modules/fxp/Makefile,v 1.9.2.3 2001/12/04 20:01:53 brooks Exp $ -# $DragonFly: src/sys/dev/netif/fxp/Makefile,v 1.3 2005/05/31 08:19:04 joerg Exp $ +# $DragonFly: src/sys/dev/netif/fxp/Makefile,v 1.4 2005/10/24 08:06:15 sephe Exp $ KMOD = if_fxp -SRCS = if_fxp.c opt_bdg.h device_if.h bus_if.h pci_if.h miibus_if.h +SRCS = if_fxp.c device_if.h bus_if.h pci_if.h miibus_if.h +SRCS += opt_bdg.h opt_polling.h KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + .include diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c index babc0324d2..c0a1151375 100644 --- a/sys/dev/netif/fxp/if_fxp.c +++ b/sys/dev/netif/fxp/if_fxp.c @@ -26,13 +26,15 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.110.2.30 2003/06/12 16:47:05 mux Exp $ - * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.36 2005/10/12 17:35:52 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.37 2005/10/24 08:06:15 sephe Exp $ */ /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/nge/Makefile b/sys/dev/netif/nge/Makefile index b8980d5d27..d46e90b8f4 100644 --- a/sys/dev/netif/nge/Makefile +++ b/sys/dev/netif/nge/Makefile @@ -1,8 +1,14 @@ # $FreeBSD: src/sys/modules/nge/Makefile,v 1.2.2.2 2001/12/04 20:01:53 brooks Exp $ -# $DragonFly: src/sys/dev/netif/nge/Makefile,v 1.3 2005/07/28 00:06:10 joerg Exp $ +# $DragonFly: src/sys/dev/netif/nge/Makefile,v 1.4 2005/10/24 08:06:15 sephe Exp $ KMOD= if_nge -SRCS= if_nge.c miibus_if.h opt_bdg.h device_if.h bus_if.h pci_if.h +SRCS= if_nge.c miibus_if.h device_if.h bus_if.h pci_if.h +SRCS+= opt_bdg.h opt_polling.h KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + .include diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c index ac841501ae..55a042e802 100644 --- a/sys/dev/netif/nge/if_nge.c +++ b/sys/dev/netif/nge/if_nge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.31 2005/10/12 17:35:52 dillon Exp $ + * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.32 2005/10/24 08:06:15 sephe Exp $ */ /* @@ -88,6 +88,8 @@ * if the user selects an MTU larger than 8152 (8170 - 18). */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/nv/Makefile b/sys/dev/netif/nv/Makefile index 4973228ac8..31fe893afc 100644 --- a/sys/dev/netif/nv/Makefile +++ b/sys/dev/netif/nv/Makefile @@ -1,13 +1,18 @@ -# $DragonFly: src/sys/dev/netif/nv/Attic/Makefile,v 1.2 2005/04/04 18:45:07 joerg Exp $ +# $DragonFly: src/sys/dev/netif/nv/Attic/Makefile,v 1.3 2005/10/24 08:06:15 sephe Exp $ CONTRIBDIR= ${.CURDIR}/../../../contrib/dev/nv KMOD= if_nv -SRCS= if_nv.c miibus_if.h device_if.h bus_if.h pci_if.h +SRCS= if_nv.c miibus_if.h device_if.h bus_if.h pci_if.h opt_polling.h SRCS+= adapter.h.patch basetype.h.patch os.h.patch phy.h.patch drvinfo.h.patch OBJS+= nvnetlib.o KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + nvnetlib.o: ${CONTRIBDIR}/nvnetlib.o.uu uudecode < ${CONTRIBDIR}/nvnetlib.o.uu diff --git a/sys/dev/netif/nv/if_nv.c b/sys/dev/netif/nv/if_nv.c index beef5032fd..4e47330369 100644 --- a/sys/dev/netif/nv/if_nv.c +++ b/sys/dev/netif/nv/if_nv.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $Id: if_nv.c,v 1.20 2005/03/12 01:11:00 q Exp $ - * $DragonFly: src/sys/dev/netif/nv/Attic/if_nv.c,v 1.19 2005/10/12 17:35:52 dillon Exp $ + * $DragonFly: src/sys/dev/netif/nv/Attic/if_nv.c,v 1.20 2005/10/24 08:06:15 sephe Exp $ */ /* @@ -74,6 +74,8 @@ * $Id: if_nv.c,v 1.9 2003/12/13 15:27:40 q Exp $ */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/re/Makefile b/sys/dev/netif/re/Makefile index 1859d8cc04..9a4f62cceb 100644 --- a/sys/dev/netif/re/Makefile +++ b/sys/dev/netif/re/Makefile @@ -1,8 +1,13 @@ -# $DragonFly: src/sys/dev/netif/re/Makefile,v 1.1 2004/07/07 09:47:27 joerg Exp $ +# $DragonFly: src/sys/dev/netif/re/Makefile,v 1.2 2005/10/24 08:06:15 sephe Exp $ KMOD = if_re -SRCS = if_re.c device_if.h bus_if.h pci_if.h +SRCS = if_re.c device_if.h bus_if.h pci_if.h opt_polling.h SRCS += miibus_if.h KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + .include diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c index 359c526178..af86bc743b 100644 --- a/sys/dev/netif/re/if_re.c +++ b/sys/dev/netif/re/if_re.c @@ -33,7 +33,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/re/if_re.c,v 1.25 2004/06/09 14:34:01 naddy Exp $ - * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.16 2005/10/12 17:35:52 dillon Exp $ + * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.17 2005/10/24 08:06:15 sephe Exp $ */ /* @@ -111,6 +111,8 @@ * driver is 7500 bytes. */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/rl/Makefile b/sys/dev/netif/rl/Makefile index 801a3bed83..28469de438 100644 --- a/sys/dev/netif/rl/Makefile +++ b/sys/dev/netif/rl/Makefile @@ -1,9 +1,15 @@ # $FreeBSD: src/sys/modules/rl/Makefile,v 1.6 2000/01/28 11:26:34 bde Exp $ -# $DragonFly: src/sys/dev/netif/rl/Makefile,v 1.3 2005/07/28 00:06:10 joerg Exp $ +# $DragonFly: src/sys/dev/netif/rl/Makefile,v 1.4 2005/10/24 08:06:15 sephe Exp $ KMOD = if_rl -SRCS = if_rl.c opt_bdg.h device_if.h bus_if.h pci_if.h +SRCS = if_rl.c device_if.h bus_if.h pci_if.h +SRCS += opt_bdg.h opt_polling.h SRCS += miibus_if.h KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + .include diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c index 9befebd437..3277839730 100644 --- a/sys/dev/netif/rl/if_rl.c +++ b/sys/dev/netif/rl/if_rl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.26 2005/10/12 17:35:52 dillon Exp $ + * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.27 2005/10/24 08:06:15 sephe Exp $ */ /* @@ -84,6 +84,8 @@ * to select which interface to use depending on the chip type. */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/sis/Makefile b/sys/dev/netif/sis/Makefile index 3707918c01..82bfeb85c9 100644 --- a/sys/dev/netif/sis/Makefile +++ b/sys/dev/netif/sis/Makefile @@ -1,9 +1,15 @@ # $FreeBSD: src/sys/modules/sis/Makefile,v 1.6 2000/01/28 11:26:35 bde Exp $ -# $DragonFly: src/sys/dev/netif/sis/Makefile,v 1.3 2005/07/28 00:06:10 joerg Exp $ +# $DragonFly: src/sys/dev/netif/sis/Makefile,v 1.4 2005/10/24 08:06:15 sephe Exp $ KMOD = if_sis -SRCS = if_sis.c opt_bdg.h device_if.h bus_if.h pci_if.h +SRCS = if_sis.c device_if.h bus_if.h pci_if.h +SRCS += opt_bdg.h opt_polling.h SRCS += miibus_if.h KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + .include diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c index 50fbe6bd02..468f32eda7 100644 --- a/sys/dev/netif/sis/if_sis.c +++ b/sys/dev/netif/sis/if_sis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.27 2005/10/12 17:35:53 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.28 2005/10/24 08:06:15 sephe Exp $ */ /* @@ -58,6 +58,8 @@ * longword aligned. */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/vr/Makefile b/sys/dev/netif/vr/Makefile index 218c930210..376a581ffa 100644 --- a/sys/dev/netif/vr/Makefile +++ b/sys/dev/netif/vr/Makefile @@ -1,9 +1,15 @@ # $FreeBSD: src/sys/modules/vr/Makefile,v 1.8 2000/01/28 11:26:42 bde Exp $ -# $DragonFly: src/sys/dev/netif/vr/Makefile,v 1.3 2005/06/20 13:01:15 joerg Exp $ +# $DragonFly: src/sys/dev/netif/vr/Makefile,v 1.4 2005/10/24 08:06:15 sephe Exp $ KMOD = if_vr -SRCS = if_vr.c opt_bdg.h device_if.h bus_if.h pci_if.h +SRCS = if_vr.c device_if.h bus_if.h pci_if.h +SRCS += opt_bdg.h opt_polling.h SRCS += miibus_if.h KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + .include diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c index fb06f0792f..2d0967ed83 100644 --- a/sys/dev/netif/vr/if_vr.c +++ b/sys/dev/netif/vr/if_vr.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.36 2005/10/12 17:35:53 dillon Exp $ + * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.37 2005/10/24 08:06:15 sephe Exp $ */ /* @@ -60,6 +60,8 @@ * transmission. */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/wi/Makefile b/sys/dev/netif/wi/Makefile index f8141ea744..631e6457a3 100644 --- a/sys/dev/netif/wi/Makefile +++ b/sys/dev/netif/wi/Makefile @@ -1,11 +1,16 @@ # $FreeBSD: src/sys/modules/wi/Makefile,v 1.3.2.3 2002/04/28 20:20:31 imp Exp $ -# $DragonFly: src/sys/dev/netif/wi/Makefile,v 1.3 2004/09/06 13:52:24 joerg Exp $ +# $DragonFly: src/sys/dev/netif/wi/Makefile,v 1.4 2005/10/24 08:06:15 sephe Exp $ KMOD= if_wi SRCS= if_wi.c if_wi_pccard.c if_wi_pci.c \ - opt_wi.h \ + opt_wi.h opt_polling.h \ card_if.h device_if.h bus_if.h pci_if.h +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + opt_wi.h: echo '#define WI_SYMBOL_FIRMWARE 1' > ${.OBJDIR}/opt_wi.h diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c index 83aca62519..8fe476ee90 100644 --- a/sys/dev/netif/wi/if_wi.c +++ b/sys/dev/netif/wi/if_wi.c @@ -32,7 +32,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.166 2004/04/01 00:38:45 sam Exp $ - * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.30 2005/10/12 17:35:53 dillon Exp $ + * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.31 2005/10/24 08:06:15 sephe Exp $ */ /* @@ -67,6 +67,8 @@ #define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */ #define WI_HERMES_STATS_WAR /* Work around stats counter bug. */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/dev/netif/xl/Makefile b/sys/dev/netif/xl/Makefile index a52d0941ee..022a652633 100644 --- a/sys/dev/netif/xl/Makefile +++ b/sys/dev/netif/xl/Makefile @@ -1,9 +1,15 @@ # $FreeBSD: src/sys/modules/xl/Makefile,v 1.9 2000/01/28 11:26:45 bde Exp $ -# $DragonFly: src/sys/dev/netif/xl/Makefile,v 1.3 2005/07/13 17:00:34 joerg Exp $ +# $DragonFly: src/sys/dev/netif/xl/Makefile,v 1.4 2005/10/24 08:06:16 sephe Exp $ KMOD = if_xl -SRCS = if_xl.c opt_bdg.h device_if.h bus_if.h pci_if.h +SRCS = if_xl.c device_if.h bus_if.h pci_if.h +SRCS += opt_bdg.h opt_polling.h SRCS += miibus_if.h KMODDEPS = miibus +.ifndef BUILDING_WITH_KERNEL +opt_polling.h: + echo '#define DEVICE_POLLING 1' > ${.OBJDIR}/${.TARGET} +.endif + .include diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c index 2c45eaaca6..d460dcfa1c 100644 --- a/sys/dev/netif/xl/if_xl.c +++ b/sys/dev/netif/xl/if_xl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.28 2003/10/08 06:01:57 murray Exp $ - * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.39 2005/10/21 06:42:43 sephe Exp $ + * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.40 2005/10/24 08:06:16 sephe Exp $ */ /* @@ -99,6 +99,8 @@ * "vortex" driver in order to obtain better performance. */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index 968b8ead94..c7144e05db 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -70,10 +70,11 @@ * * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 * $FreeBSD: src/sys/kern/kern_clock.c,v 1.105.2.10 2002/10/17 13:19:40 maxim Exp $ - * $DragonFly: src/sys/kern/kern_clock.c,v 1.49 2005/10/13 00:45:36 dillon Exp $ + * $DragonFly: src/sys/kern/kern_clock.c,v 1.50 2005/10/24 08:06:16 sephe Exp $ */ #include "opt_ntp.h" +#include "opt_polling.h" #include #include diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c index 11b2065d8a..eee5ebac34 100644 --- a/sys/kern/kern_poll.c +++ b/sys/kern/kern_poll.c @@ -25,9 +25,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/kern_poll.c,v 1.2.2.4 2002/06/27 23:26:33 luigi Exp $ - * $DragonFly: src/sys/kern/kern_poll.c,v 1.20 2005/10/20 15:54:55 dillon Exp $ + * $DragonFly: src/sys/kern/kern_poll.c,v 1.21 2005/10/24 08:06:16 sephe Exp $ */ +#include "opt_polling.h" + #include #include #include diff --git a/sys/net/if.c b/sys/net/if.c index 610f23a609..af98829c2e 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -32,12 +32,13 @@ * * @(#)if.c 8.3 (Berkeley) 1/4/94 * $FreeBSD: src/sys/net/if.c,v 1.185 2004/03/13 02:35:03 brooks Exp $ - * $DragonFly: src/sys/net/if.c,v 1.40 2005/06/15 19:29:30 joerg Exp $ + * $DragonFly: src/sys/net/if.c,v 1.41 2005/10/24 08:06:16 sephe Exp $ */ #include "opt_compat.h" #include "opt_inet6.h" #include "opt_inet.h" +#include "opt_polling.h" #include #include diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 9b974bc802..e650f4dde1 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -32,7 +32,7 @@ * * From: @(#)if.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_var.h,v 1.18.2.16 2003/04/15 18:11:19 fjoe Exp $ - * $DragonFly: src/sys/net/if_var.h,v 1.30 2005/06/15 19:29:30 joerg Exp $ + * $DragonFly: src/sys/net/if_var.h,v 1.31 2005/10/24 08:06:16 sephe Exp $ */ #ifndef _NET_IF_VAR_H_ @@ -105,6 +105,16 @@ struct ifqueue { int ifq_drops; }; +/* + * Note of DEVICE_POLLING + * 1) Any file(*.c) that depends on DEVICE_POLLING supports in this + * file should include opt_polling.h at its beginning. + * 2) When struct changes, which are conditioned by DEVICE_POLLING, + * are to be introduced, please keep the struct's size and layout + * same, no matter whether DEVICE_POLLING is defined or not. + * See ifnet.if_poll and ifnet.if_poll_unused for example. + */ + #ifdef DEVICE_POLLING enum poll_cmd { POLL_ONLY, POLL_AND_CHECK_STATUS, POLL_DEREGISTER, POLL_REGISTER }; -- 2.41.0