[kernel] r12967 - in dists/sid/linux-2.6/debian: . patches/debian/dfsg patches/features/all patches/series

[Ben Hutchings]

Author: benh
Date: Tue Mar  3 23:46:58 2009
New Revision: 12967

Log:
Update acenic and bnx2 request_firmware() patches and reenable the drivers (closes: #517181)


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
   dists/sid/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch
   dists/sid/linux-2.6/debian/patches/series/2

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Mar  3 23:46:58 2009
@@ -53,7 +53,11 @@
   [ Stephen R. Marenka ]
   * [m68k] add 2.6.28 patches.
 
- -- Martin Michlmayr <tbm at cyrius.com>  Wed, 18 Feb 2009 18:01:40 +0100
+  [ Ben Hutchings ]
+  * Update acenic and bnx2 request_firmware() patches and reenable the
+    drivers (closes: #517181)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 03 Mar 2009 23:46:01 +0000
 
 linux-2.6 (2.6.28-1) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch	Tue Mar  3 23:46:58 2009
@@ -20,8 +20,8 @@
  
 @@ -59,12 +59,20 @@
  #define PFX DRV_MODULE_NAME	": "
- #define DRV_MODULE_VERSION	"1.8.0"
- #define DRV_MODULE_RELDATE	"Aug 14, 2008"
+ #define DRV_MODULE_VERSION	"1.8.1"
+ #define DRV_MODULE_RELDATE	"Oct 7, 2008"
 +#define FW_FILE_06		"bnx2-06-4.4.1.fw"
 +#define FW_FILE_09		"bnx2-09-4.4.26.fw"
  
@@ -40,7 +40,7 @@
  	"Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
  
 @@ -72,6 +80,8 @@ MODULE_AUTHOR("Michael Chan <mchan at broadcom.com>");
- MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709 Driver");
+ MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/5716 Driver");
  MODULE_LICENSE("GPL");
  MODULE_VERSION(DRV_MODULE_VERSION);
 +MODULE_FIRMWARE(FW_FILE_06);
@@ -370,7 +370,7 @@
 +
  	memcpy(dev->dev_addr, bp->mac_addr, 6);
  	memcpy(dev->perm_addr, bp->mac_addr, 6);
- 	bp->name = board_info[ent->driver_data].name;
+ 
 @@ -7714,13 +7714,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
  
  	if ((rc = register_netdev(dev))) {
@@ -415,11 +415,10 @@
 index c3c579f..15e837e 100644
 --- a/drivers/net/bnx2.h
 +++ b/drivers/net/bnx2.h
-@@ -6860,6 +6860,8 @@ struct bnx2 {
+@@ -6860,6 +6860,7 @@ struct bnx2 {
+ 
+ 	u32			idle_chk_status_idx;
  
- 	u8			num_tx_rings;
- 	u8			num_rx_rings;
-+
 +	const struct firmware	*firmware;
  };
  

Modified: dists/sid/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/features/all/drivers-net-acenic-firmwar_request.patch	Tue Mar  3 23:46:58 2009
@@ -259,8 +259,8 @@
 --- a/drivers/net/acenic.h
 +++ b/drivers/net/acenic.h
 @@ -695,6 +695,10 @@ struct ace_private
+ 	u32			last_tx, last_std_rx, last_mini_rx;
  #endif
- 	struct net_device_stats stats;
  	int			pci_using_dac;
 +	u8			firmware_major;
 +	u8			firmware_minor;
@@ -268,5 +268,4 @@
 +	u32			firmware_start;
  };
  
-
-
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/2
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/2	(original)
+++ dists/sid/linux-2.6/debian/patches/series/2	Tue Mar  3 23:46:58 2009
@@ -1,3 +1,6 @@
++ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
++ features/all/drivers-net-acenic-firmwar_request.patch
+
 + bugfix/all/stable/2.6.28.7.patch
 
 # m68k patches