Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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>
authored by Amit S. Kale and committed by Jeff Garzik 90f8b1d2 41b69c70
+3
-4
drivers/net/netxen/netxen_nic.h
+3
-4
drivers/net/netxen/netxen_nic.h
···
63
63
64
64
#include "netxen_nic_hw.h"
65
65
66
-
#define NETXEN_NIC_BUILD_NO "4"
66
+
#define NETXEN_NIC_BUILD_NO "1"
67
67
#define _NETXEN_NIC_LINUX_MAJOR 3
68
68
#define _NETXEN_NIC_LINUX_MINOR 3
69
-
#define _NETXEN_NIC_LINUX_SUBVERSION 2
70
-
#define NETXEN_NIC_LINUX_VERSIONID "3.3.2" "-" NETXEN_NIC_BUILD_NO
71
-
#define NETXEN_NIC_FW_VERSIONID "3.3.2"
69
+
#define _NETXEN_NIC_LINUX_SUBVERSION 3
70
+
#define NETXEN_NIC_LINUX_VERSIONID "3.3.3" "-" NETXEN_NIC_BUILD_NO
72
71
73
72
#define RCV_DESC_RINGSIZE \
74
73
(sizeof(struct rcv_desc) * adapter->max_rx_desc_count)
+2
-1
drivers/net/netxen/netxen_nic_hw.c
+2
-1
drivers/net/netxen/netxen_nic_hw.c
···
984
984
_NETXEN_NIC_LINUX_MAJOR, fw_major);
985
985
adapter->driver_mismatch = 1;
986
986
}
987
-
if (fw_minor != _NETXEN_NIC_LINUX_MINOR) {
987
+
if (fw_minor != _NETXEN_NIC_LINUX_MINOR &&
988
+
fw_minor != (_NETXEN_NIC_LINUX_MINOR + 1)) {
988
989
printk(KERN_ERR "The mismatch in driver version and firmware "
989
990
"version minor number\n"
990
991
"Driver version minor number = %d \t"