From owner-svn-src-head@freebsd.org  Sun Apr 24 15:56:07 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 1F35DB19CA5;
 Sun, 24 Apr 2016 15:56:07 +0000 (UTC) (envelope-from bz@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 E5FA316B9;
 Sun, 24 Apr 2016 15:56:06 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3OFu6SO064648;
 Sun, 24 Apr 2016 15:56:06 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3OFu6Gk064647;
 Sun, 24 Apr 2016 15:56:06 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201604241556.u3OFu6Gk064647@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 24 Apr 2016 15:56:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298543 - head/sys/ofed/drivers/infiniband/core
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.21
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: Sun, 24 Apr 2016 15:56:07 -0000

Author: bz
Date: Sun Apr 24 15:56:05 2016
New Revision: 298543
URL: https://svnweb.freebsd.org/changeset/base/298543

Log:
  Fix NOIP kernels to compile.

Modified:
  head/sys/ofed/drivers/infiniband/core/cma.c

Modified: head/sys/ofed/drivers/infiniband/core/cma.c
==============================================================================
--- head/sys/ofed/drivers/infiniband/core/cma.c	Sun Apr 24 14:49:01 2016	(r298542)
+++ head/sys/ofed/drivers/infiniband/core/cma.c	Sun Apr 24 15:56:05 2016	(r298543)
@@ -2319,6 +2319,7 @@ static int cma_bind_addr(struct rdma_cm_
 	if (!cma_any_addr(src_addr))
 		return rdma_bind_addr(id, src_addr);
 	else {
+#if defined(INET6) || defined(INET)
 		union {
 #ifdef INET
 			struct sockaddr_in in;
@@ -2327,6 +2328,7 @@ static int cma_bind_addr(struct rdma_cm_
 			struct sockaddr_in6 in6;
 #endif
 		} addr;
+#endif
 
 		switch(dst_addr->sa_family) {
 #ifdef INET