- better fix for linux 3.7

- rel 2

diff --git a/igb.spec b/igb.spec
index cc1d15cd863274b04010e6d372a460e9f9203ede..5fc0189d1118840b191e6b2f5e835e0a09e58a98 100644 (file)
--- a/igb.spec
+++ b/igb.spec
@@ -14,7 +14,7 @@
 %undefine      with_userspace
 %endif
 
-%define                rel     1
+%define                rel     2
 %define                pname   igb
 Summary:       Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel(R) PRO/1000

diff --git a/linux-3.7.patch b/linux-3.7.patch
index 719367389e31fa6b0f32d520b31525aba9f36391..ba07f6d74db3563f875aa94f2c0708cfb552d5ba 100644 (file)
--- a/linux-3.7.patch
+++ b/linux-3.7.patch
@@ -1,11 +1,14 @@
 --- igb-4.0.17/src/igb_main.c~ 2012-10-08 17:37:31.000000000 +0200
 +++ igb-4.0.17/src/igb_main.c  2012-12-20 13:47:16.403675607 +0100
-@@ -7833,7 +7833,7 @@
+@@ -7833,7 +7833,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)