- better linux 3.7 fix

- rel 11

diff --git a/ixgbe.spec b/ixgbe.spec
index 7f9f2e84b061b823cf780e8f1c064a8bf687e89c..c38f017b54dcb045e4b7e3613d6d43bb5afd402a 100644 (file)
--- 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 664299fdcbac5f6e7e2a23dc6becefc58487594b..217a6d78cbf85da227b43095b58df224f7599bb2 100644 (file)
--- 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)