| From 7e8e5d9718744b817bfea6f020586d7035cc89f4 Mon Sep 17 00:00:00 2001 |
| From: Dhananjay Phadke <dhananjay@netxen.com> |
| Date: Sat, 24 Oct 2009 16:04:02 +0000 |
| Subject: netxen: module firmware hints |
| |
| From: Dhananjay Phadke <dhananjay@netxen.com> |
| |
| commit 7e8e5d9718744b817bfea6f020586d7035cc89f4 upstream. |
| |
| Add MODULE_FIRMWARE hints for various firmware file types, |
| required by different chip revisions. |
| |
| Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/netxen/netxen_nic.h | 6 ++++++ |
| drivers/net/netxen/netxen_nic_init.c | 6 +++++- |
| drivers/net/netxen/netxen_nic_main.c | 4 ++++ |
| 3 files changed, 15 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/netxen/netxen_nic.h |
| +++ b/drivers/net/netxen/netxen_nic.h |
| @@ -487,6 +487,12 @@ struct status_desc { |
| #define NX_P3_MN_ROMIMAGE 2 |
| #define NX_FLASH_ROMIMAGE 3 |
| |
| +#define NX_P2_MN_ROMIMAGE_NAME "nxromimg.bin" |
| +#define NX_P3_CT_ROMIMAGE_NAME "nx3fwct.bin" |
| +#define NX_P3_MN_ROMIMAGE_NAME "nx3fwmn.bin" |
| +#define NX_UNIFIED_ROMIMAGE_NAME "phanfw.bin" |
| +#define NX_FLASH_ROMIMAGE_NAME "flash" |
| + |
| extern char netxen_nic_driver_name[]; |
| |
| /* Number of status descriptors to handle per interrupt */ |
| --- a/drivers/net/netxen/netxen_nic_init.c |
| +++ b/drivers/net/netxen/netxen_nic_init.c |
| @@ -673,7 +673,11 @@ netxen_need_fw_reset(struct netxen_adapt |
| } |
| |
| static char *fw_name[] = { |
| - "nxromimg.bin", "nx3fwct.bin", "nx3fwmn.bin", "flash", |
| + NX_P2_MN_ROMIMAGE_NAME, |
| + NX_P3_CT_ROMIMAGE_NAME, |
| + NX_P3_MN_ROMIMAGE_NAME, |
| + NX_UNIFIED_ROMIMAGE_NAME, |
| + NX_FLASH_ROMIMAGE_NAME, |
| }; |
| |
| int |
| --- a/drivers/net/netxen/netxen_nic_main.c |
| +++ b/drivers/net/netxen/netxen_nic_main.c |
| @@ -38,6 +38,10 @@ |
| MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver"); |
| MODULE_LICENSE("GPL"); |
| MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID); |
| +MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME); |
| +MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME); |
| +MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME); |
| +MODULE_FIRMWARE(NX_UNIFIED_ROMIMAGE_NAME); |
| |
| char netxen_nic_driver_name[] = "netxen_nic"; |
| static char netxen_nic_driver_string[] = "NetXen Network Driver version " |
