From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 20 Dec 2012 13:03:40 +0000 (+0100)
Subject: - better fix for linux 3.7
X-Git-Tag: auto/th/igb-4.0.17-2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=82fe9b584d67c4e7246995ba2761c7cd102e2be7;p=packages%2Figb.git

- better fix for linux 3.7
- rel 2
---

diff --git a/igb.spec b/igb.spec
index cc1d15c..5fc0189 100644
--- 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 7193673..ba07f6d 100644
--- 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)