[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/749123d0ffa0
changeset: 500:749123d0ffa0
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Wed Jul 25 16:52:53 2012 +0300
description:
Lazy update

diffstat:

 head/sys/modules/cxgb/Makefile         |  37 ++++-----------------------------
 head/sys/modules/cxgb/cxgb/Makefile    |  21 ++++++++++++++++--
 head/sys/modules/cxgb/iw_cxgb/Makefile |  17 +++++++++++---
 head/sys/modules/cxgb/tom/Makefile     |  18 ++++++++++++---
 4 files changed, 50 insertions(+), 43 deletions(-)

diffs (149 lines):

diff -r 01046c037816 -r 749123d0ffa0 head/sys/modules/cxgb/Makefile
--- a/head/sys/modules/cxgb/Makefile	Wed Jul 25 16:52:36 2012 +0300
+++ b/head/sys/modules/cxgb/Makefile	Wed Jul 25 16:52:53 2012 +0300
@@ -1,39 +1,12 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/cxgb/Makefile 237263 2012-06-19 07:34:13Z np $
 SUBDIR= cxgb
-SUBDIR+= ${_toecore}
+SUBDIR+= cxgb_t3fw
 SUBDIR+= ${_tom}
 SUBDIR+= ${_iw_cxgb}
-SUBDIR+= cxgb_t3fw
 
-.if defined(SYSDIR)
-_sysdir = ${SYSDIR}
-.endif
-
-# Based on bsd.kmod.mk but we don't modify SYSDIR in this one.
-.for _dir in ${.CURDIR}/../.. ${.CURDIR}/../../.. ${.CURDIR}/../../../.. \
-    /sys /usr/src/sys
-.if !defined(_sysdir) && exists(${_dir}/kern/) && exists(${_dir}/conf/kmod.mk)
-_sysdir = ${_dir}
-.endif
-.endfor
-.if !defined(_sysdir) || !exists(${_sysdir}/kern/) || \
-    !exists(${_sysdir}/conf/kmod.mk)
-.error "can't find kernel source tree"
-.endif
-
-_toe_header = ${_sysdir}/netinet/toedev.h
-
-.if exists(${_toe_header})
-_toecore = toecore
-#_tom = tom
-.endif
-
-.if ${MACHINE_CPUARCH} == "i386" && exists(${_toe_header})
-_iw_cxgb = iw_cxgb
-.endif
-
-.if ${MACHINE_CPUARCH} == "amd64" && exists(${_toe_header})
-_iw_cxgb = iw_cxgb
+.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+_tom=		tom
+_iw_cxgb=	iw_cxgb
 .endif
 
 .include <bsd.subdir.mk>
diff -r 01046c037816 -r 749123d0ffa0 head/sys/modules/cxgb/cxgb/Makefile
--- a/head/sys/modules/cxgb/cxgb/Makefile	Wed Jul 25 16:52:36 2012 +0300
+++ b/head/sys/modules/cxgb/cxgb/Makefile	Wed Jul 25 16:52:53 2012 +0300
@@ -1,4 +1,6 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/cxgb/cxgb/Makefile 237263 2012-06-19 07:34:13Z np $
+
+.include <bsd.own.mk>
 
 CXGB = ${.CURDIR}/../../../dev/cxgb
 .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
@@ -6,11 +8,24 @@
 KMOD=	if_cxgb
 SRCS=	cxgb_mc5.c cxgb_vsc8211.c cxgb_ael1002.c cxgb_mv88e1xxx.c 
 SRCS+=	cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c cxgb_aq100x.c
-SRCS+=  cxgb_sge.c cxgb_offload.c cxgb_tn1010.c
+SRCS+=  cxgb_sge.c cxgb_tn1010.c
 SRCS+=	device_if.h bus_if.h pci_if.h
-SRCS+=	opt_inet.h opt_zero.h opt_sched.h
+SRCS+=	opt_inet.h opt_inet6.h opt_zero.h opt_sched.h
 SRCS+=	uipc_mvec.c
 
 CFLAGS+= -g -DDEFAULT_JUMBO -I${CXGB}
 
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	@echo "#define INET 1" > ${.TARGET}
+	@echo "#define TCP_OFFLOAD 1" >> ${.TARGET}
+.endif
+
+.if ${MK_INET6_SUPPORT} != "no"
+opt_inet6.h:
+	@echo "#define INET6 1" > ${.TARGET}
+.endif
+.endif
+
 .include <bsd.kmod.mk>
diff -r 01046c037816 -r 749123d0ffa0 head/sys/modules/cxgb/iw_cxgb/Makefile
--- a/head/sys/modules/cxgb/iw_cxgb/Makefile	Wed Jul 25 16:52:36 2012 +0300
+++ b/head/sys/modules/cxgb/iw_cxgb/Makefile	Wed Jul 25 16:52:53 2012 +0300
@@ -1,4 +1,6 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/cxgb/iw_cxgb/Makefile 237263 2012-06-19 07:34:13Z np $
+
+.include <bsd.own.mk>
 
 CXGB = ${.CURDIR}/../../../dev/cxgb
 .PATH: ${CXGB}/ulp/iw_cxgb
@@ -8,8 +10,15 @@
 SRCS+=  iw_cxgb_provider.c iw_cxgb_qp.c iw_cxgb_resource.c
 SRCS+=  iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c
 SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h
-SRCS+=  opt_inet.h
-CFLAGS+= -g -I${CXGB}
-#CFLAGS+= -DDEBUG
+SRCS+=  opt_inet.h opt_ofed.h vnode_if.h
+CFLAGS+= -I${CXGB} -I${.CURDIR}/../../../ofed/include -DLINUX_TYPES_DEFINED
+
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	echo "#define INET 1" > ${.TARGET}
+	echo "#define TCP_OFFLOAD 1" >> ${.TARGET}
+.endif
+.endif
 
 .include <bsd.kmod.mk>
diff -r 01046c037816 -r 749123d0ffa0 head/sys/modules/cxgb/tom/Makefile
--- a/head/sys/modules/cxgb/tom/Makefile	Wed Jul 25 16:52:36 2012 +0300
+++ b/head/sys/modules/cxgb/tom/Makefile	Wed Jul 25 16:52:53 2012 +0300
@@ -1,15 +1,25 @@
-# $FreeBSD$
+# $FreeBSD: head/sys/modules/cxgb/tom/Makefile 237263 2012-06-19 07:34:13Z np $
+
+.include <bsd.own.mk>
 
 CXGB = ${.CURDIR}/../../../dev/cxgb
 .PATH: ${CXGB}/ulp/tom
 
-KMOD=	tom
-SRCS=   cxgb_tom.c cxgb_cpl_io.c cxgb_listen.c cxgb_tom_sysctl.c cxgb_cpl_socket.c
-SRCS+=  cxgb_ddp.c cxgb_vm.c cxgb_l2t.c cxgb_tcp_offload.c
+KMOD=	t3_tom
+SRCS=   cxgb_tom.c cxgb_cpl_io.c cxgb_listen.c cxgb_l2t.c
 SRCS+=	opt_compat.h opt_inet.h opt_inet6.h opt_ipsec.h
 SRCS+=	opt_tcpdebug.h opt_ddb.h opt_sched.h opt_global.h opt_ktr.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 CFLAGS+= -g -I${CXGB}
 
 #CFLAGS+= -DDEBUG_PRINT -DDEBUG
+
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	echo "#define INET 1" > ${.TARGET}
+	echo "#define TCP_OFFLOAD 1" >> ${.TARGET}
+.endif
+.endif
+
 .include <bsd.kmod.mk>