[packages/ixgbe] - better linux 3.7 fix - rel 11

baggins baggins at pld-linux.org
Thu Dec 20 14:02:36 CET 2012


commit 6b5544b27d52dd183c6793bac906bc97957e9a7c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Dec 20 14:02:10 2012 +0100

    - better linux 3.7 fix
    - rel 11

 ixgbe.spec      | 2 +-
 linux-3.7.patch | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ixgbe.spec b/ixgbe.spec
index 7f9f2e8..c38f017 100644
--- a/ixgbe.spec
+++ b/ixgbe.spec
@@ -14,7 +14,7 @@
 %undefine	with_userspace
 %endif
 
-%define		rel	10
+%define		rel	11
 %define		pname	ixgbe
 Summary:	Intel(R) 10 Gigabit driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel(R) 10 Gigabit
diff --git a/linux-3.7.patch b/linux-3.7.patch
index 664299f..217a6d7 100644
--- a/linux-3.7.patch
+++ b/linux-3.7.patch
@@ -1,11 +1,14 @@
 --- ixgbe-3.11.33/src/ixgbe_main.c~	2012-10-04 17:39:15.000000000 +0200
 +++ ixgbe-3.11.33/src/ixgbe_main.c	2012-12-20 13:58:51.727606335 +0100
-@@ -9108,7 +9108,7 @@
+@@ -9108,7 +9108,11 @@
  		goto skip_bad_vf_detection;
  
  	bdev = pdev->bus->self;
--	while (bdev && (bdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT))
++#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) )
+ 	while (bdev && (bdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT))
++#else
 +	while (bdev && (pci_pcie_type(bdev) != PCI_EXP_TYPE_ROOT_PORT))
++#endif
  		bdev = bdev->bus->self;
  
  	if (!bdev)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ixgbe.git/commitdiff/6b5544b27d52dd183c6793bac906bc97957e9a7c



More information about the pld-cvs-commit mailing list