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

[Ben Hutchings]

Author: benh
Date: Fri Feb 27 13:37:55 2009
New Revision: 12955

Log:
Refresh bnx2 request_firmware() patch.
Remove reference to acenic request_firmware() patch, merged upstream.


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 Feb 27 13:37:55 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.9.2"
+ #define DRV_MODULE_RELDATE	"Feb 11, 2009"
 +#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);
@@ -344,9 +344,9 @@
  	int rc;
  	char str[40];
 +	const char *fw_file;
- 	DECLARE_MAC_BUF(mac);
  
  	if (version_printed++ == 0)
+ 		printk(KERN_INFO "%s", version);
 @@ -7697,6 +7680,23 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
  
  	pci_set_drvdata(pdev, dev);
@@ -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/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 Feb 27 13:37:55 2009
@@ -6,8 +6,7 @@
 + debian/drivers-ata-ata_piix-postpone-pata.patch
 + debian/drivers-ata-pata_sis-postpone-pata.patch
 
-#+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
-#+ features/all/drivers-net-acenic-firmwar_request.patch
++ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
 + features/all/drivers-gpu-drm-mga-request_firmware.patch
 + features/all/drivers-gpu-drm-r128-request_firmware.patch
 + features/all/drivers-gpu-drm-radeon-request_firmware.patch