提交 11d89d63 编写于 作者: D Dhananjay Phadke 提交者: Jeff Garzik

netxen: update driver version

Raise driver version to 4.0.11.
Signed-off-by: NDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
上级 092bc571
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
#define _NETXEN_NIC_LINUX_MAJOR 4 #define _NETXEN_NIC_LINUX_MAJOR 4
#define _NETXEN_NIC_LINUX_MINOR 0 #define _NETXEN_NIC_LINUX_MINOR 0
#define _NETXEN_NIC_LINUX_SUBVERSION 0 #define _NETXEN_NIC_LINUX_SUBVERSION 11
#define NETXEN_NIC_LINUX_VERSIONID "4.0.0" #define NETXEN_NIC_LINUX_VERSIONID "4.0.11"
#define NETXEN_VERSION_CODE(a, b, c) (((a) << 16) + ((b) << 8) + (c)) #define NETXEN_VERSION_CODE(a, b, c) (((a) << 16) + ((b) << 8) + (c))
......
...@@ -2208,10 +2208,10 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter) ...@@ -2208,10 +2208,10 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
if (adapter->portnum == 0) { if (adapter->portnum == 0) {
get_brd_name_by_type(board_info->board_type, brd_name); get_brd_name_by_type(board_info->board_type, brd_name);
printk("NetXen %s Board S/N %s Chip id 0x%x\n", printk(KERN_INFO "NetXen %s Board S/N %s Chip rev 0x%x\n",
brd_name, serial_num, board_info->chip_id); brd_name, serial_num, adapter->ahw.revision_id);
printk("NetXen Firmware version %d.%d.%d\n", fw_major, printk(KERN_INFO "NetXen Firmware version %d.%d.%d\n",
fw_minor, fw_build); fw_major, fw_minor, fw_build);
} }
if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) < if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) <
......
...@@ -523,6 +523,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -523,6 +523,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return -ENODEV; return -ENODEV;
} }
if (pdev->revision >= NX_P3_A0 && pdev->revision < NX_P3_B1) {
printk(KERN_WARNING "NetXen chip revisions between 0x%x-0x%x"
"will not be enabled.\n",
NX_P3_A0, NX_P3_B1);
return -ENODEV;
}
if ((err = pci_enable_device(pdev))) if ((err = pci_enable_device(pdev)))
return err; return err;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册