Date: Mon, 21 Oct 2013 01:10:38 +0000 (UTC) From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r256819 - in stable/10/sys: dev/cxgbe/iw_cxgbe modules/cxgbe modules/cxgbe/iw_cxgbe Message-ID: <201310210110.r9L1AcGu003945@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: np Date: Mon Oct 21 01:10:37 2013 New Revision: 256819 URL: http://svnweb.freebsd.org/changeset/base/256819 Log: MFC r256694, r256713, r256714. r256694: iw_cxgbe: iWARP driver for Chelsio T4/T5 chips. This is a straight port of the iw_cxgb4 found in OFED distributions. r256713: iw_cxgbe should have a dependency on t4nex. r256714: Fix typo in previous commit. Approved by: re (hrs) Added: stable/10/sys/dev/cxgbe/iw_cxgbe/ - copied from r256694, head/sys/dev/cxgbe/iw_cxgbe/ stable/10/sys/modules/cxgbe/iw_cxgbe/ - copied from r256694, head/sys/modules/cxgbe/iw_cxgbe/ Modified: stable/10/sys/dev/cxgbe/iw_cxgbe/device.c stable/10/sys/modules/cxgbe/Makefile Directory Properties: stable/10/sys/ (props changed) Modified: stable/10/sys/dev/cxgbe/iw_cxgbe/device.c ============================================================================== --- head/sys/dev/cxgbe/iw_cxgbe/device.c Thu Oct 17 18:37:25 2013 (r256694) +++ stable/10/sys/dev/cxgbe/iw_cxgbe/device.c Mon Oct 21 01:10:37 2013 (r256819) @@ -363,6 +363,7 @@ static moduledata_t c4iw_mod_data = { }; MODULE_VERSION(iw_cxgbe, 1); +MODULE_DEPEND(iw_cxgbe, t4nex, 1, 1, 1); MODULE_DEPEND(iw_cxgbe, t4_tom, 1, 1, 1); MODULE_DEPEND(iw_cxgbe, ibcore, 1, 1, 1); DECLARE_MODULE(iw_cxgbe, c4iw_mod_data, SI_SUB_EXEC, SI_ORDER_ANY); Modified: stable/10/sys/modules/cxgbe/Makefile ============================================================================== --- stable/10/sys/modules/cxgbe/Makefile Mon Oct 21 00:58:35 2013 (r256818) +++ stable/10/sys/modules/cxgbe/Makefile Mon Oct 21 01:10:37 2013 (r256819) @@ -6,9 +6,16 @@ SUBDIR = if_cxgbe SUBDIR+= t4_firmware SUBDIR+= t5_firmware SUBDIR+= ${_tom} +SUBDIR+= ${_iw_cxgbe} -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" _tom= tom +_iw_cxgbe= iw_cxgbe .endif +.if ${MACHINE_CPUARCH} == "i386" +_tom= tom +.endif + + .include <bsd.subdir.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310210110.r9L1AcGu003945>