* [PATCH 1/2] NetXen: Firmware check modifications
@ 2007-01-22 14:38 Amit S. Kale
2007-01-23 6:02 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Amit S. Kale @ 2007-01-22 14:38 UTC (permalink / raw)
To: netdev
Cc: amitkale, brazilnut, jeff, linuxram, netxenproj, rob, sanjeev,
wendyx
This patch is to make the driver work with multiple minor firmware versions
Signed-off-by: Amit S. Kale <amitkale@netxen.com>
---
netxen_nic.h | 7 +++----
netxen_nic_hw.c | 3 ++-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 6490acf..663fa2f 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -63,12 +63,11 @@ #include <asm/pgtable.h>
#include "netxen_nic_hw.h"
-#define NETXEN_NIC_BUILD_NO "4"
+#define NETXEN_NIC_BUILD_NO "1"
#define _NETXEN_NIC_LINUX_MAJOR 3
#define _NETXEN_NIC_LINUX_MINOR 3
-#define _NETXEN_NIC_LINUX_SUBVERSION 2
-#define NETXEN_NIC_LINUX_VERSIONID "3.3.2" "-" NETXEN_NIC_BUILD_NO
-#define NETXEN_NIC_FW_VERSIONID "3.3.2"
+#define _NETXEN_NIC_LINUX_SUBVERSION 3
+#define NETXEN_NIC_LINUX_VERSIONID "3.3.3" "-" NETXEN_NIC_BUILD_NO
#define RCV_DESC_RINGSIZE \
(sizeof(struct rcv_desc) * adapter->max_rx_desc_count)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index c0c31d1..191e233 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -984,7 +984,8 @@ void netxen_nic_flash_print(struct netxe
_NETXEN_NIC_LINUX_MAJOR, fw_major);
adapter->driver_mismatch = 1;
}
- if (fw_minor != _NETXEN_NIC_LINUX_MINOR) {
+ if (fw_minor != _NETXEN_NIC_LINUX_MINOR &&
+ fw_minor != (_NETXEN_NIC_LINUX_MINOR + 1)) {
printk(KERN_ERR "The mismatch in driver version and firmware "
"version minor number\n"
"Driver version minor number = %d \t"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 1/2] NetXen: Firmware check modifications
@ 2007-01-22 14:39 Amit S. Kale
0 siblings, 0 replies; 3+ messages in thread
From: Amit S. Kale @ 2007-01-22 14:39 UTC (permalink / raw)
To: netdev
Cc: amitkale, brazilnut, jeff, linuxram, netxenproj, ricknu-0, rob,
sanjeev, wendyx
This will use pci_register_driver() instead of pci_module_init().
Signed-off-by: Amit S. Kale <amitkale@netxen.com>
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
---
netxen_nic.h | 2 +-
netxen_nic_main.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 663fa2f..59324b1 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -63,7 +63,7 @@ #include <asm/pgtable.h>
#include "netxen_nic_hw.h"
-#define NETXEN_NIC_BUILD_NO "1"
+#define NETXEN_NIC_BUILD_NO "2"
#define _NETXEN_NIC_LINUX_MAJOR 3
#define _NETXEN_NIC_LINUX_MINOR 3
#define _NETXEN_NIC_LINUX_SUBVERSION 3
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 8a5792f..96e1bee 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1144,7 +1144,7 @@ static int __init netxen_init_module(voi
if ((netxen_workq = create_singlethread_workqueue("netxen")) == 0)
return -ENOMEM;
- return pci_module_init(&netxen_driver);
+ return pci_register_driver(&netxen_driver);
}
module_init(netxen_init_module);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] NetXen: Firmware check modifications
2007-01-22 14:38 [PATCH 1/2] NetXen: Firmware check modifications Amit S. Kale
@ 2007-01-23 6:02 ` Jeff Garzik
0 siblings, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2007-01-23 6:02 UTC (permalink / raw)
To: Amit S. Kale
Cc: netdev, brazilnut, linuxram, netxenproj, rob, sanjeev, wendyx
Amit S. Kale wrote:
> This patch is to make the driver work with multiple minor firmware versions
>
> Signed-off-by: Amit S. Kale <amitkale@netxen.com>
applied 1-2 to #upstream-fixes
comments on patch #2 follow this email
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-01-23 6:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-22 14:38 [PATCH 1/2] NetXen: Firmware check modifications Amit S. Kale
2007-01-23 6:02 ` Jeff Garzik
-- strict thread matches above, loose matches on Subject: below --
2007-01-22 14:39 Amit S. Kale
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).