From owner-svn-src-user@freebsd.org  Sun Jan  3 06:12:54 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 F3834A601C9
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Sun,  3 Jan 2016 06:12:54 +0000 (UTC)
 (envelope-from ngie@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 C4DEB17A0;
 Sun,  3 Jan 2016 06:12:54 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u036CrTa073228;
 Sun, 3 Jan 2016 06:12:53 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u036Crp3073227;
 Sun, 3 Jan 2016 06:12:53 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601030612.u036Crp3073227@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Sun, 3 Jan 2016 06:12:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293074 - user/ngie/stable-10-libnv/sys/dev/ixl
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jan 2016 06:12:55 -0000

Author: ngie
Date: Sun Jan  3 06:12:53 2016
New Revision: 293074
URL: https://svnweb.freebsd.org/changeset/base/293074

Log:
  Fix module compilation pre-r266974
  
  if_getdrvflags(9) wasn't available until __FreeBSD_version > 1100022,
  and backporting r266974 opens a huge can of KPI worms

Modified:
  user/ngie/stable-10-libnv/sys/dev/ixl/if_ixl.c

Modified: user/ngie/stable-10-libnv/sys/dev/ixl/if_ixl.c
==============================================================================
--- user/ngie/stable-10-libnv/sys/dev/ixl/if_ixl.c	Sun Jan  3 06:02:56 2016	(r293073)
+++ user/ngie/stable-10-libnv/sys/dev/ixl/if_ixl.c	Sun Jan  3 06:12:53 2016	(r293074)
@@ -6619,7 +6619,11 @@ ixl_uninit_iov(device_t dev)
 		pf->veb_seid = 0;
 	}
 
+#if __FreeBSD_version > 1100022
 	if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
+#else
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+#endif
 		ixl_disable_intr(vsi);
 
 	vfs = pf->vfs;