Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11d89d63 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by Jeff Garzik
Browse files

netxen: update driver version 



Raise driver version to 4.0.11.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 092bc571

drivers/net/netxen/netxen_nic.h

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ 


#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_NIC_LINUX_SUBVERSION 11

#define NETXEN_NIC_LINUX_VERSIONID  "4.0.11"



#define NETXEN_VERSION_CODE(a, b, c)	(((a) << 16) + ((b) << 8) + (c))

drivers/net/netxen/netxen_nic_hw.c

+4 −4
Original line number Diff line number Diff line
@@ -2208,10 +2208,10 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter) 
	if (adapter->portnum == 0) {

		get_brd_name_by_type(board_info->board_type, brd_name);



		printk("NetXen %s Board S/N %s  Chip id 0x%x\n",

				brd_name, serial_num, board_info->chip_id);

		printk("NetXen Firmware version %d.%d.%d\n", fw_major,

				fw_minor, fw_build);

		printk(KERN_INFO "NetXen %s Board S/N %s  Chip rev 0x%x\n",

				brd_name, serial_num, adapter->ahw.revision_id);

		printk(KERN_INFO "NetXen Firmware version %d.%d.%d\n",

				fw_major, fw_minor, fw_build);

	}



	if (NETXEN_VERSION_CODE(fw_major, fw_minor, fw_build) <

drivers/net/netxen/netxen_nic_main.c

+7 −0
Original line number Diff line number Diff line
@@ -523,6 +523,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		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)))

		return err;