Home » Mailing list archives » linux-netdev » 2009 » March » 16

[patch next] netxen: fix firmware download warnings

Previous thread: [GIT]: Networking by David Miller on Sunday, March 15, 2009 - 8:56 pm. (1 message)

Next thread: [PATCH net-2.6 ] ipv4: remove parameter from tcp_recv_urg(). by Rami Rosen on Monday, March 16, 2009 - 2:57 am. (2 messages)
[view original message]
From: Dhananjay Phadke
Subject: [patch next] netxen: fix firmware download warnings
Date: Sunday, March 15, 2009 - 11:41 pm

Fix following warnings, by using integer firmware types.

drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_load_firmware':
drivers/net/netxen/netxen_nic_hw.c:1146: warning: comparison with string literal results in unspecified behavior
drivers/net/netxen/netxen_nic_hw.c:1146: warning: comparison with string literal results in unspecified behavior
drivers/net/netxen/netxen_nic_hw.c:1146: warning: comparison with string literal results in unspecified behavior
drivers/net/netxen/netxen_nic_hw.c:1159: warning: comparison with string literal results in unspecified behavior
drivers/net/netxen/netxen_nic_hw.c:1159: warning: comparison with string literal results in unspecified behavior
drivers/net/netxen/netxen_nic_hw.c:1159: warning: comparison with string literal results in unspecified behavior

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
 drivers/net/netxen/netxen_nic.h    |    6 +++---
 drivers/net/netxen/netxen_nic_hw.c |   24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 2544129..78e6228 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -693,9 +693,9 @@ typedef enum {
 #define NX_BIOS_VERSION_OFFSET	(NETXEN_USER_START+0x83c)
 #define NX_FW_MAGIC_OFFSET	(NETXEN_BRDCFG_START+0x128)
 #define NX_FW_MIN_SIZE		(0x3fffff)
-#define NX_P2_MN_ROMIMAGE	"nxromimg.bin"
-#define NX_P3_CT_ROMIMAGE	"nx3fwct.bin"
-#define NX_P3_MN_ROMIMAGE	"nx3fwmn.bin"
+#define NX_P2_MN_ROMIMAGE	0
+#define NX_P3_CT_ROMIMAGE	1
+#define NX_P3_MN_ROMIMAGE	2
 
 #define NETXEN_USER_START_OLD NETXEN_PXE_START	/* for backward compatibility */
 
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index c89c791..b24cfdd 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -1130,21 +1130,21 @@ ...
[ message continues ]
[view original message]
From: David Miller
Subject: Re: [patch next] netxen: fix firmware download warnings
Date: Tuesday, March 17, 2009 - 1:14 pm

From: Dhananjay Phadke <dhananjay@netxen.com>

Applied, thanks.
--


[ message continues ]
Previous thread: [GIT]: Networking by David Miller on Sunday, March 15, 2009 - 8:56 pm. (1 message)

Next thread: [PATCH net-2.6 ] ipv4: remove parameter from tcp_recv_urg(). by Rami Rosen on Monday, March 16, 2009 - 2:57 am. (2 messages)