Date: Sat, 15 Dec 2007 22:17:52 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 130980 for review Message-ID: <200712152217.lBFMHq7i050926@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=130980 Change 130980 by jb@jb_freebsd1 on 2007/12/15 22:17:16 IFC Affected files ... .. //depot/projects/dtrace/src/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/dtrace/src/sys/net/if.h#9 integrate Differences ... ==== //depot/projects/dtrace/src/sys/modules/cxgb/Makefile#2 (text+ko) ==== @@ -1,45 +1,7 @@ -# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.10 2007/09/09 01:28:02 kmacy Exp $ +# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.11 2007/12/15 22:03:18 kmacy Exp $ +SUBDIR= cxgb +SUBDIR+= toecore +#SUBDIR+= tom +#SUBDIR+= iw_cxgb -CXGB = ${.CURDIR}/../../dev/cxgb -.PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys - -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 -SRCS+= cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c -SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h -SRCS+= uipc_mvec.c - -CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -#CFLAGS+= -DDEBUG -DDEBUG_PRINT -#CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS -DWITNESS - - -.if ${MACHINE_ARCH} != "ia64" -# ld is broken on ia64 -t3fw-4.7.0.bin: ${CXGB}/t3fw-4.7.0.bin.gz.uu - uudecode -p < ${CXGB}/t3fw-4.7.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS= t3fw-4.7.0.bin:t3fw470 -CLEANFILES+= t3fw-4.7.0.bin - -t3b_protocol_sram-1.1.0.bin: ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu - uudecode -p < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS+= t3b_protocol_sram-1.1.0.bin:t3bps110 -CLEANFILES+= t3b_protocol_sram-1.1.0.bin - -t3b_tp_eeprom-1.1.0.bin: ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu - uudecode -p < ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu \ - | gzip -dc > ${.TARGET} - -FIRMWS+= t3b_tp_eeprom-1.1.0.bin:t3btpe110 -CLEANFILES+= t3b_tp_eeprom-1.1.0.bin - - -.endif - - -.include <bsd.kmod.mk> +.include <bsd.subdir.mk> ==== //depot/projects/dtrace/src/sys/net/if.h#9 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/net/if.h,v 1.111 2007/12/15 21:01:48 kmacy Exp $ + * $FreeBSD: src/sys/net/if.h,v 1.112 2007/12/15 22:06:23 kmacy Exp $ */ #ifndef _NET_IF_H_ @@ -218,7 +218,7 @@ #define IFCAP_HWCSUM (IFCAP_RXCSUM | IFCAP_TXCSUM) #define IFCAP_TSO (IFCAP_TSO4 | IFCAP_TSO6) #define IFCAP_WOL (IFCAP_WOL_UCAST | IFCAP_WOL_MCAST | IFCAP_WOL_MAGIC) -#define IFCAP_TSO (IFCAP_TOE4 | IFCAP_TOE6) +#define IFCAP_TOE (IFCAP_TOE4 | IFCAP_TOE6) #define IFQ_MAXLEN 50 #define IFNET_SLOWHZ 1 /* granularity is 1 second */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712152217.lBFMHq7i050926>