From owner-svn-src-head@freebsd.org  Sun Jan  3 18:09:48 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 4F168A60596;
 Sun,  3 Jan 2016 18:09:48 +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 1E0501601;
 Sun,  3 Jan 2016 18:09:48 +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 u03I9lBZ091472;
 Sun, 3 Jan 2016 18:09:47 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u03I9lNJ091471;
 Sun, 3 Jan 2016 18:09:47 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201601031809.u03I9lNJ091471@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 18:09:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r293112 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
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, 03 Jan 2016 18:09:48 -0000

Author: ngie
Date: Sun Jan  3 18:09:46 2016
New Revision: 293112
URL: https://svnweb.freebsd.org/changeset/base/293112

Log:
  Fix ixl(4) compilation with PCI_IOV pre-r266974
  
  stable/10 doesn't have the if_getdrvflags(9) KPI. Reference the field in the
  structure directly if the __FreeBSD_version is < 1100022, so the driver can
  be built with PCI_IOV support on stable/10, without backporting all of
  r266974 (which requires additional changes due to projects/ifnet, etc)
  
  Differential Revision: https://reviews.freebsd.org/D4759
  Reviewed by: erj, sbruno
  Sponsored by: EMC / Isilon Storage Division

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

Modified: head/sys/dev/ixl/if_ixl.c
==============================================================================
--- head/sys/dev/ixl/if_ixl.c	Sun Jan  3 17:58:11 2016	(r293111)
+++ head/sys/dev/ixl/if_ixl.c	Sun Jan  3 18:09:46 2016	(r293112)
@@ -6606,7 +6606,11 @@ ixl_iov_uninit(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;