From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 18 Dec 2015 13:32:40 +0000 (+0100)
Subject: use upstream bnx2 and aacraid drivers
X-Git-Url: https://git.proxmox.com/?p=pve-kernel-3.10.0.git;a=commitdiff_plain;h=a4bc2c8c16027abacdabd9f40005875e4237ce7f

use upstream bnx2 and aacraid drivers

latest drivers from qlogic and adaptec does not compile.
---

diff --git a/Makefile b/Makefile
index be62e96..6a381e5 100644
--- a/Makefile
+++ b/Makefile
@@ -42,9 +42,11 @@ IXGBESRC=${IXGBEDIR}.tar.gz
 I40EDIR=i40e-1.3.49
 I40ESRC=${I40EDIR}.tar.gz
 
+# does not compile with RHEL 7.2 (=327.3.1.el7)
 BNX2DIR=netxtreme2-7.11.05
 BNX2SRC=${BNX2DIR}.tar.gz
 
+# does not compile with RHEL 7.2 (=327.3.1.el7)
 AACRAIDVER=1.2.1-40700
 AACRAIDDIR=aacraid-${AACRAIDVER}.src
 AACRAIDSRC=aacraid-linux-src-${AACRAIDVER}.tgz
@@ -118,7 +120,8 @@ fwlist-${KVNAME}: data
 	mv fwlist.tmp $@
 
 # fixme: bnx2.ko cnic.ko bnx2x.ko
-data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic.ko bnx2x.ko aacraid.ko arcmsr.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
+# todo: aacraid.ko ?
+data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko i40e.ko ixgbe.ko arcmsr.ko hpsa.ko ${SPL_MODULES} ${ZFS_MODULES}
 	rm -rf data tmp; mkdir -p tmp/lib/modules/${KVNAME}
 	mkdir tmp/boot
 	install -m 644 ${KERNEL_CFG} tmp/boot/config-${KVNAME}
@@ -134,11 +137,11 @@ data: .compile_mark ${KERNEL_CFG} e1000e.ko igb.ko i40e.ko ixgbe.ko bnx2.ko cnic
 	# install latest ibg driver
 	install -m 644 igb.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/intel/igb/
 	## install bnx2 drivers
-	install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
-	install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
-	install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/bnx2x/
+	#install -m 644 bnx2.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
+	#install -m 644 cnic.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/
+	#install -m 644 bnx2x.ko tmp/lib/modules/${KVNAME}/kernel/drivers/net/ethernet/broadcom/bnx2x/
 	# install aacraid drivers
-	install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
+	#install -m 644 aacraid.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/aacraid/
 	# install hpsa driver
 	install -m 644 hpsa.ko tmp/lib/modules/${KVNAME}/kernel/drivers/scsi/
 	# install megaraid_sas driver
diff --git a/README b/README
index 6ac650a..30e3721 100644
--- a/README
+++ b/README
@@ -19,14 +19,14 @@ Additional/Updated Modules:
 
 - include latest e1000e driver from intel/sourceforge
 
- include latest Broadcom bnx2 drivers: http://driverdownloads.qlogic.com/
-
-  * original file linux-7.11.05.zip contains
-    netxtreme2-7.11.05.tar.gz (added to repository)
-
-- include latest Adaptec aacraid driver
-
-  * http://download.adaptec.com/raid/aac/linux/aacraid-linux-src-1.2.1-40300.tgz
+#- include latest Broadcom bnx2 drivers: http://driverdownloads.qlogic.com/
+#
+#  * original file linux-7.11.05.zip contains
+#    netxtreme2-7.11.05.tar.gz (added to repository)
+#
+#- include latest Adaptec aacraid driver
+#
+#  * http://download.adaptec.com/raid/aac/linux/aacraid-linux-src-1.2.1-40300.tgz
 
 - include latest ARECA RAID drivers
 
diff --git a/changelog.Debian b/changelog.Debian
index 29b9520..b1856ea 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -15,6 +15,10 @@ pve-kernel-3.10.0 (3.10.0-40) unstable; urgency=low
   * update i40e to 1.3.49
   
   * update ixgbe to 4.2.3
+  
+  * use upstream bnx2 drivers (drivers from qlogic does not compile)
+  
+  * use upstream aacraid (drivers from adaptect site does not compile)
 
  -- Proxmox Support Team <support@proxmox.com>  Fri, 18 Dec 2015 09:25:51 +0100
 
diff --git a/netxtreme2-7.11.05.tar.gz b/netxtreme2-7.11.05.tar.gz
deleted file mode 100644
index 7caeb8a..0000000
Binary files a/netxtreme2-7.11.05.tar.gz and /dev/null differ
diff --git a/netxtreme2-7.13.01.tar.gz b/netxtreme2-7.13.01.tar.gz
new file mode 100644
index 0000000..d88e9fb
Binary files /dev/null and b/netxtreme2-7.13.01.tar.gz differ