diff options
Diffstat (limited to 'drivers/net/netxen/netxen_nic_hw.c')
-rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index ed8aa5ab2668..96a3bc6426e2 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
@@ -2168,16 +2168,12 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter) | |||
2168 | fw_minor, fw_build); | 2168 | fw_minor, fw_build); |
2169 | } | 2169 | } |
2170 | 2170 | ||
2171 | if (fw_major != _NETXEN_NIC_LINUX_MAJOR) { | 2171 | if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) < |
2172 | NETXEN_VERSION_CODE(3, 4, 216)) { | ||
2172 | adapter->driver_mismatch = 1; | 2173 | adapter->driver_mismatch = 1; |
2173 | } | 2174 | printk(KERN_ERR "%s: firmware version %d.%d.%d unsupported\n", |
2174 | if (fw_minor != _NETXEN_NIC_LINUX_MINOR && | 2175 | netxen_nic_driver_name, |
2175 | fw_minor != (_NETXEN_NIC_LINUX_MINOR + 1)) { | 2176 | fw_major, fw_minor, fw_build); |
2176 | adapter->driver_mismatch = 1; | ||
2177 | } | ||
2178 | if (adapter->driver_mismatch) { | ||
2179 | printk(KERN_ERR "%s: driver and firmware version mismatch\n", | ||
2180 | adapter->netdev->name); | ||
2181 | return; | 2177 | return; |
2182 | } | 2178 | } |
2183 | } | 2179 | } |