- fix build with linux 3.7

- rel 10

diff --git a/ixgbe.spec b/ixgbe.spec
index 18fe0086ebc59dd1684c388f4ecccf35e1d461f5..7f9f2e84b061b823cf780e8f1c064a8bf687e89c 100644 (file)
--- a/ixgbe.spec
+++ b/ixgbe.spec
@@ -14,7 +14,7 @@
 %undefine      with_userspace
 %endif
 
-%define                rel     9
+%define                rel     10
 %define                pname   ixgbe
 Summary:       Intel(R) 10 Gigabit driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel(R) 10 Gigabit
@@ -25,6 +25,7 @@ License:      GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
 # Source0-md5: 7b512003c112680adda402c6c88e8cbf
+Patch0:                linux-3.7.patch
 URL:           http://sourceforge.net/projects/e1000/
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires: rpmbuild(macros) >= 1.379
@@ -59,6 +60,7 @@ Intel(R) 10 Gigabit opartych o układ 82598EB.
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 cp src/Makefile src/Makefile.%{name}
 cat > src/Makefile <<'EOF'
 obj-m := ixgbe.o

diff --git a/linux-3.7.patch b/linux-3.7.patch
new file mode 100644 (file)
index 0000000..664299f
--- /dev/null
+++ b/linux-3.7.patch
@@ -0,0 +1,11 @@
+--- 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 @@
+               goto skip_bad_vf_detection;
+ 
+       bdev = pdev->bus->self;
+-      while (bdev && (bdev->pcie_type != PCI_EXP_TYPE_ROOT_PORT))
++      while (bdev && (pci_pcie_type(bdev) != PCI_EXP_TYPE_ROOT_PORT))
+               bdev = bdev->bus->self;
+ 
+       if (!bdev)