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>
This commit is contained in:
parent
41b69c7051
commit
90f8b1d295
2 changed files with 5 additions and 5 deletions
|
@ -63,12 +63,11 @@
|
||||||
|
|
||||||
#include "netxen_nic_hw.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_MAJOR 3
|
||||||
#define _NETXEN_NIC_LINUX_MINOR 3
|
#define _NETXEN_NIC_LINUX_MINOR 3
|
||||||
#define _NETXEN_NIC_LINUX_SUBVERSION 2
|
#define _NETXEN_NIC_LINUX_SUBVERSION 3
|
||||||
#define NETXEN_NIC_LINUX_VERSIONID "3.3.2" "-" NETXEN_NIC_BUILD_NO
|
#define NETXEN_NIC_LINUX_VERSIONID "3.3.3" "-" NETXEN_NIC_BUILD_NO
|
||||||
#define NETXEN_NIC_FW_VERSIONID "3.3.2"
|
|
||||||
|
|
||||||
#define RCV_DESC_RINGSIZE \
|
#define RCV_DESC_RINGSIZE \
|
||||||
(sizeof(struct rcv_desc) * adapter->max_rx_desc_count)
|
(sizeof(struct rcv_desc) * adapter->max_rx_desc_count)
|
||||||
|
|
|
@ -984,7 +984,8 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
|
||||||
_NETXEN_NIC_LINUX_MAJOR, fw_major);
|
_NETXEN_NIC_LINUX_MAJOR, fw_major);
|
||||||
adapter->driver_mismatch = 1;
|
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 "
|
printk(KERN_ERR "The mismatch in driver version and firmware "
|
||||||
"version minor number\n"
|
"version minor number\n"
|
||||||
"Driver version minor number = %d \t"
|
"Driver version minor number = %d \t"
|
||||||
|
|
Reference in a new issue