- updated to 4.0.3

diff --git a/ixgbe.spec b/ixgbe.spec
index d8cb7ae8e29eeff12afa8a835d7f978618f36550..cf6384205b76329e65fbbeaff72d7197999b58de 100644 (file)
--- a/ixgbe.spec
+++ b/ixgbe.spec
@@ -9,13 +9,12 @@
 Summary:       Intel(R) 10 Gigabit driver for Linux
 Summary(pl.UTF-8):     Sterownik do karty Intel(R) 10 Gigabit
 Name:          %{pname}%{_alt_kernel}
-Version:       3.23.2.1
+Version:       4.0.3
 Release:       %{rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://downloads.sourceforge.net/e1000/%{pname}-%{version}.tar.gz
-# Source0-md5: bcec8bd3eb3abfa97d4fe00f272acd69
-Patch0:                linux-3.19.patch
+# Source0-md5: fd81102645a6cbdea727a52f7b9d34f5
 URL:           http://sourceforge.net/projects/e1000/
 %{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires: rpmbuild(macros) >= 1.701
@@ -78,14 +77,13 @@ EOF\
 
 %prep
 %setup -q -n %{pname}-%{version}
-%patch0 -p1
 
 cp src/Makefile src/Makefile.%{name}
 cat > src/Makefile <<'EOF'
 obj-m := ixgbe.o
 ixgbe-objs := ixgbe_main.o ixgbe_common.o ixgbe_api.o ixgbe_param.o \
 ixgbe_lib.o ixgbe_ethtool.o kcompat.o ixgbe_82598.o \
-ixgbe_82599.o ixgbe_ptp.o ixgbe_x540.o ixgbe_sriov.o \
+ixgbe_82599.o ixgbe_ptp.o ixgbe_x540.o ixgbe_x550.o ixgbe_sriov.o \
 ixgbe_mbx.o ixgbe_dcb.o ixgbe_dcb_82598.o ixgbe_dcb_82599.o \
 ixgbe_sysfs.o ixgbe_procfs.o ixgbe_phy.o ixgbe_fcoe.o \
 ixgbe_dcb_nl.o ixgbe_dcb_nl.o ixgbe_debugfs.o

diff --git a/linux-3.19.patch b/linux-3.19.patch
deleted file mode 100644 (file)
index 7e62b15..0000000
--- a/linux-3.19.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- ixgbe-3.23.2.1/src/ixgbe_main.c.orig       2015-03-30 20:07:50.662015699 +0200
-+++ ixgbe-3.23.2.1/src/ixgbe_main.c    2015-03-30 20:12:33.988694214 +0200
-@@ -8874,10 +8874,17 @@
- 
- #ifdef HAVE_FDB_OPS
- #ifdef USE_CONST_DEV_UC_CHAR
-+#ifdef USE_NDO_DFLT_FDB_VID
-+static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
-+                           struct net_device *dev,
-+                           const unsigned char *addr,
-+                           u16 flags, u16 vid)
-+#else
- static int ixgbe_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
-                            struct net_device *dev,
-                            const unsigned char *addr,
-                            u16 flags)
-+#endif
- #else
- static int ixgbe_ndo_fdb_add(struct ndmsg *ndm,
-                            struct net_device *dev,
-@@ -8892,7 +8899,11 @@
-       }
- 
- #ifdef USE_CONST_DEV_UC_CHAR
-+#ifdef USE_NDO_DFLT_FDB_VID
-+      return ndo_dflt_fdb_add(ndm, tb, dev, addr, flags, vid);
-+#else
-       return ndo_dflt_fdb_add(ndm, tb, dev, addr, flags);
-+#endif
- #else
-       return ndo_dflt_fdb_add(ndm, dev, addr, flags);
- #endif
-@@ -8955,7 +8966,11 @@
- 
-       mode = adapter->bridge_mode;
- 
-+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) )
-+      return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
-+#else
-       return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
-+#endif
- }
- #endif /* HAVE_BRIDGE_ATTRIBS */
- #endif /* HAVE_FDB_OPS */
---- ixgbe-3.23.2.1/src/kcompat.h~      2015-02-18 23:06:34.000000000 +0100
-+++ ixgbe-3.23.2.1/src/kcompat.h       2015-03-30 20:07:25.142014632 +0200
-@@ -3935,6 +3935,10 @@
- #define USE_CONST_DEV_UC_CHAR
- #endif /* >= 3.7.0 */
- 
-+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) )
-+#define USE_NDO_DFLT_FDB_VID
-+#endif
-+
- /*****************************************************************************/
- #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) )
- #ifndef pci_sriov_set_totalvfs