aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_hw.c
diff options
context:
space:
mode:
authorAmit S. Kale <amitkale@netxen.com>2007-01-22 06:38:05 -0800
committerJeff Garzik <jeff@garzik.org>2007-01-23 01:02:11 -0500
commit90f8b1d295e0c4a2148776e6cf801391cf07ae92 (patch)
tree50799f0b8352dc3118fb4a225708a18fa02004dd /drivers/net/netxen/netxen_nic_hw.c
parentehea: Fixed possible nullpointer access (diff)
downloadlinux-dev-90f8b1d295e0c4a2148776e6cf801391cf07ae92.tar.xz
linux-dev-90f8b1d295e0c4a2148776e6cf801391cf07ae92.zip
NetXen: Firmware check modifications
This patch is to make the driver work with multiple minor firmware versions Signed-off-by: Amit S. Kale <amitkale@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.c')
-rw-r--r--drivers/net/netxen/netxen_nic_hw.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index c0c31d1914a7..191e2336e323 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 netxen_adapter *adapter)
_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"