From owner-svn-src-all@freebsd.org  Sat Aug 20 00:08:12 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 1BDA8BBE001;
 Sat, 20 Aug 2016 00:08:12 +0000 (UTC) (envelope-from erj@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 DD60E17A1;
 Sat, 20 Aug 2016 00:08:11 +0000 (UTC) (envelope-from erj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7K08Bai069628;
 Sat, 20 Aug 2016 00:08:11 GMT (envelope-from erj@FreeBSD.org)
Received: (from erj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7K08Bok069627;
 Sat, 20 Aug 2016 00:08:11 GMT (envelope-from erj@FreeBSD.org)
Message-Id: <201608200008.u7K08Bok069627@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org
 using -f
From: Eric Joyner <erj@FreeBSD.org>
Date: Sat, 20 Aug 2016 00:08:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r304510 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Aug 2016 00:08:12 -0000

Author: erj
Date: Sat Aug 20 00:08:10 2016
New Revision: 304510
URL: https://svnweb.freebsd.org/changeset/base/304510

Log:
  ixlv(4): Fix ixlv(4) not loading when loaded as a kernel module and netmap is enabled.
  
  Define (unused) netmap variables; ixlv(4) doesn't support netmap yet.
  
  Reported by:	sergey.kozlov@intel.com
  Sponsored by:	Intel Corporation

Modified:
  head/sys/dev/ixl/if_ixlv.c

Modified: head/sys/dev/ixl/if_ixlv.c
==============================================================================
--- head/sys/dev/ixl/if_ixlv.c	Fri Aug 19 23:44:07 2016	(r304509)
+++ head/sys/dev/ixl/if_ixlv.c	Sat Aug 20 00:08:10 2016	(r304510)
@@ -217,6 +217,10 @@ TUNABLE_INT("hw.ixlv.tx_itr", &ixlv_tx_i
 SYSCTL_INT(_hw_ixlv, OID_AUTO, tx_itr, CTLFLAG_RDTUN,
     &ixlv_tx_itr, 0, "TX Interrupt Rate");
 
+/* Fix when building as a standalone module when netmap is enabled */
+#if defined(DEV_NETMAP) && !defined(NETMAP_IXL_MAIN)
+int ixl_rx_miss, ixl_rx_miss_bufs, ixl_crcstrip;
+#endif
         
 /*********************************************************************
  *  Device identification routine