[kernel] r11789 - in dists/trunk/linux-2.6/debian/patches: debian/dfsg series

[Bastian Blank]

Author: waldi
Date: Fri Jul  4 21:27:32 2008
New Revision: 11789

Log:
* debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch: Fix.
* debian/patches/series/1~experimental.1: Reenable bnx2 patch.


Modified:
   dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch	Fri Jul  4 21:27:32 2008
@@ -18,8 +18,8 @@
  
 @@ -58,12 +57,20 @@
  #define PFX DRV_MODULE_NAME	": "
- #define DRV_MODULE_VERSION	"1.7.4"
- #define DRV_MODULE_RELDATE	"February 18, 2008"
+ #define DRV_MODULE_VERSION	"1.7.5"
+ #define DRV_MODULE_RELDATE	"April 29, 2008"
 +#define FW_FILE_06		"bnx2-06-4.0.5.fw"
 +#define FW_FILE_09		"bnx2-09-4.0.5.fw"
  
@@ -46,7 +46,7 @@
  
  static int disable_msi = 0;
  
-@@ -3161,26 +3170,32 @@ bnx2_set_rx_mode(struct net_device *dev)
+@@ -3161,32 +3170,32 @@ bnx2_set_rx_mode(struct net_device *dev)
  	spin_unlock_bh(&bp->phy_lock);
  }
  
@@ -69,6 +69,12 @@
 +	DPRINTK("load rv2p firmware with length %u from file offset %u\n", len, offset);
 +
 +	data = (u32 *)(bp->firmware->data + offset);
+-	if (rv2p_proc == RV2P_PROC2 && CHIP_NUM(bp) == CHIP_NUM_5709) {
+-		val = le32_to_cpu(rv2p_code[XI_RV2P_PROC2_MAX_BD_PAGE_LOC]);
+-		val &= ~XI_RV2P_PROC2_BD_PAGE_SIZE_MSK;
+-		val |= XI_RV2P_PROC2_BD_PAGE_SIZE;
+-		rv2p_code[XI_RV2P_PROC2_MAX_BD_PAGE_LOC] = cpu_to_le32(val);
+-	}
  
 -	for (i = 0; i < rv2p_code_len; i += 8) {
 -		REG_WR(bp, BNX2_RV2P_INSTR_HIGH, le32_to_cpu(*rv2p_code));

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Fri Jul  4 21:27:32 2008
@@ -8,7 +8,7 @@
 + debian/drivers-ata-ata_piix-postpone-pata.patch
 
 + debian/dfsg/drivers-net-tg3-fix-simple.patch
-#+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
++ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
 + features/all/drivers-usb-serial-keyspan-request_firmware.patch
 + features/all/drivers-char-ip2-request_firmware.patch
 + features/all/drivers-net-acenic-firmwar_request.patch