Date: Mon, 12 Apr 2010 23:19:11 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r206527 - in user/imp/tbemd/sys/modules: dummynet em geom geom/geom_sched Message-ID: <201004122319.o3CNJBfJ071410@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Apr 12 23:19:11 2010 New Revision: 206527 URL: http://svn.freebsd.org/changeset/base/206527 Log: merge from head, part 12 of many Added: user/imp/tbemd/sys/modules/geom/geom_sched/ - copied from r206514, head/sys/modules/geom/geom_sched/ Modified: user/imp/tbemd/sys/modules/dummynet/Makefile user/imp/tbemd/sys/modules/em/Makefile user/imp/tbemd/sys/modules/geom/Makefile Modified: user/imp/tbemd/sys/modules/dummynet/Makefile ============================================================================== --- user/imp/tbemd/sys/modules/dummynet/Makefile Mon Apr 12 23:18:16 2010 (r206526) +++ user/imp/tbemd/sys/modules/dummynet/Makefile Mon Apr 12 23:19:11 2010 (r206527) @@ -5,6 +5,9 @@ .PATH: ${.CURDIR}/../../netinet/ipfw KMOD= dummynet SRCS= ip_dummynet.c +SRCS+= ip_dn_glue.c ip_dn_io.c +SRCS+= dn_heap.c dn_sched_fifo.c dn_sched_qfq.c dn_sched_rr.c dn_sched_wf2q.c +SRCS+= dn_sched_prio.c SRCS+= opt_inet6.h .if !defined(KERNBUILDDIR) Modified: user/imp/tbemd/sys/modules/em/Makefile ============================================================================== --- user/imp/tbemd/sys/modules/em/Makefile Mon Apr 12 23:18:16 2010 (r206526) +++ user/imp/tbemd/sys/modules/em/Makefile Mon Apr 12 23:19:11 2010 (r206527) @@ -2,15 +2,19 @@ .PATH: ${.CURDIR}/../../dev/e1000 KMOD = if_em SRCS = device_if.h bus_if.h pci_if.h opt_inet.h -SRCS += if_em.c $(SHARED_SRCS) -SHARED_SRCS = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c -SHARED_SRCS += e1000_80003es2lan.c e1000_82542.c e1000_82541.c e1000_82543.c -SHARED_SRCS += e1000_82540.c e1000_ich8lan.c e1000_82571.c e1000_osdep.c -SHARED_SRCS += e1000_82575.c +SRCS += $(CORE_SRC) $(LEGACY_SRC) +SRCS += $(COMMON_SHARED) $(LEGACY_SHARED) $(PCIE_SHARED) +CORE_SRC = if_em.c e1000_osdep.c +# This is the Legacy, pre-PCIE source, it can be +# undefined when using modular driver if not needed +LEGACY_SRC += if_lem.c +COMMON_SHARED = e1000_api.c e1000_phy.c e1000_nvm.c e1000_mac.c e1000_manage.c +PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c +LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c -CFLAGS+= -I${.CURDIR}/../../dev/e1000 +CFLAGS += -I${.CURDIR}/../../dev/e1000 -# DEVICE_POLLING gives you Legacy interrupt handling +# DEVICE_POLLING for a non-interrupt-driven method #CFLAGS += -DDEVICE_POLLING clean: Modified: user/imp/tbemd/sys/modules/geom/Makefile ============================================================================== --- user/imp/tbemd/sys/modules/geom/Makefile Mon Apr 12 23:18:16 2010 (r206526) +++ user/imp/tbemd/sys/modules/geom/Makefile Mon Apr 12 23:19:11 2010 (r206527) @@ -19,6 +19,7 @@ SUBDIR= geom_bde \ geom_part \ geom_pc98 \ geom_raid3 \ + geom_sched \ geom_shsec \ geom_stripe \ geom_sunlabel \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004122319.o3CNJBfJ071410>