From 3085b2844b46d5ae1b0768cda09d996d3d54cdd9 Mon Sep 17 00:00:00 2001
From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Mon, 21 Jul 2008 19:44:10 -0700
Subject: [PATCH] --- yaml --- r: 104911 b: refs/heads/master c:
 58735567b6de3034c9d0d7e1dcf31614b66de986 h: refs/heads/master i:   104909:
 9985a3c97e47f21124689665c0ce208608ebaf5c   104907:
 6e09d8384a51e40f45941f20ad549528a1b1490f   104903:
 332b29befc3d13d32b23199eb5d3a67e3e540c97   104895:
 2ea41985f9ac99ac7f8fc205ee14ccb240cabc6a v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/net/netxen/netxen_nic.h    | 10 ++++++----
 trunk/drivers/net/netxen/netxen_nic_hw.c | 14 +++++---------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index d5c0bb4e9c48..5b278e684613 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd1f8160e015cd1538701b7de216cbeaefc6b0a8
+refs/heads/master: 58735567b6de3034c9d0d7e1dcf31614b66de986
diff --git a/trunk/drivers/net/netxen/netxen_nic.h b/trunk/drivers/net/netxen/netxen_nic.h
index bcc551ef8519..ac710c30d3ff 100644
--- a/trunk/drivers/net/netxen/netxen_nic.h
+++ b/trunk/drivers/net/netxen/netxen_nic.h
@@ -63,10 +63,12 @@
 
 #include "netxen_nic_hw.h"
 
-#define _NETXEN_NIC_LINUX_MAJOR 3
-#define _NETXEN_NIC_LINUX_MINOR 4
-#define _NETXEN_NIC_LINUX_SUBVERSION 18
-#define NETXEN_NIC_LINUX_VERSIONID  "3.4.18"
+#define _NETXEN_NIC_LINUX_MAJOR 4
+#define _NETXEN_NIC_LINUX_MINOR 0
+#define _NETXEN_NIC_LINUX_SUBVERSION 0
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.0"
+
+#define NETXEN_VERSION_CODE(a, b, c)	(((a) << 16) + ((b) << 8) + (c))
 
 #define NETXEN_NUM_FLASH_SECTORS (64)
 #define NETXEN_FLASH_SECTOR_SIZE (64 * 1024)
diff --git a/trunk/drivers/net/netxen/netxen_nic_hw.c b/trunk/drivers/net/netxen/netxen_nic_hw.c
index ed8aa5ab2668..96a3bc6426e2 100644
--- a/trunk/drivers/net/netxen/netxen_nic_hw.c
+++ b/trunk/drivers/net/netxen/netxen_nic_hw.c
@@ -2168,16 +2168,12 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
 				fw_minor, fw_build);
 	}
 
-	if (fw_major != _NETXEN_NIC_LINUX_MAJOR) {
+	if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) <
+			NETXEN_VERSION_CODE(3, 4, 216)) {
 		adapter->driver_mismatch = 1;
-	}
-	if (fw_minor != _NETXEN_NIC_LINUX_MINOR &&
-			fw_minor != (_NETXEN_NIC_LINUX_MINOR + 1)) {
-		adapter->driver_mismatch = 1;
-	}
-	if (adapter->driver_mismatch) {
-		printk(KERN_ERR "%s: driver and firmware version mismatch\n",
-				adapter->netdev->name);
+		printk(KERN_ERR "%s: firmware version %d.%d.%d unsupported\n",
+				netxen_nic_driver_name,
+				fw_major, fw_minor, fw_build);
 		return;
 	}
 }