From owner-svn-src-head@freebsd.org  Fri May 27 11:37:57 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9084BB4C1B0;
 Fri, 27 May 2016 11:37:57 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5D3561334;
 Fri, 27 May 2016 11:37:57 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4RBbutU041233;
 Fri, 27 May 2016 11:37:56 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4RBbu69041232;
 Fri, 27 May 2016 11:37:56 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201605271137.u4RBbu69041232@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Fri, 27 May 2016 11:37:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300838 - head/sys/modules/iscsi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 May 2016 11:37:57 -0000

Author: trasz
Date: Fri May 27 11:37:56 2016
New Revision: 300838
URL: https://svnweb.freebsd.org/changeset/base/300838

Log:
  Build iscsi(4) with ICL_KERNEL_PROXY when building with WITH_OFED.
  
  MFC after:	1 month
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/modules/iscsi/Makefile

Modified: head/sys/modules/iscsi/Makefile
==============================================================================
--- head/sys/modules/iscsi/Makefile	Fri May 27 11:37:02 2016	(r300837)
+++ head/sys/modules/iscsi/Makefile	Fri May 27 11:37:56 2016	(r300838)
@@ -1,5 +1,8 @@
 # $FreeBSD$
 
+SYSDIR?=${.CURDIR}/../..
+.include "${SYSDIR}/conf/kern.opts.mk"
+
 .PATH:	${.CURDIR}/../../dev/iscsi/
 KMOD=	iscsi
 
@@ -13,7 +16,9 @@ SRCS+=	device_if.h
 SRCS+=	icl_conn_if.c
 SRCS+=	icl_conn_if.h
 
-#CFLAGS+=-DICL_KERNEL_PROXY
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
+CFLAGS+=-DICL_KERNEL_PROXY
+.endif
 
 MFILES=	kern/bus_if.m kern/device_if.m dev/iscsi/icl_conn_if.m