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

Commit c25c0b9b authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: update module info 



Update module info with QLogic signature.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0e08fac

drivers/net/netxen/netxen_nic_main.c

+6 −12
Original line number Diff line number Diff line
@@ -36,12 +36,12 @@ 
#include <linux/inetdevice.h>

#include <linux/sysfs.h>



MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");

MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Converged Ethernet Driver");

MODULE_LICENSE("GPL");

MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);



char netxen_nic_driver_name[] = "netxen_nic";

static char netxen_nic_driver_string[] = "NetXen Network Driver version "

static char netxen_nic_driver_string[] = "QLogic/NetXen Network Driver v"

    NETXEN_NIC_LINUX_VERSIONID;



static int port_mode = NETXEN_PORT_MODE_AUTO_NEG;
@@ -55,7 +55,6 @@ static int use_msi_x = 1; 


static unsigned long auto_fw_reset = AUTO_FW_RESET_ENABLED;



/* Local functions to NetXen NIC driver */

static int __devinit netxen_nic_probe(struct pci_dev *pdev,

		const struct pci_device_id *ent);

static void __devexit netxen_nic_remove(struct pci_dev *pdev);
@@ -731,7 +730,8 @@ netxen_check_options(struct netxen_adapter *adapter) 
	if (adapter->portnum == 0) {

		get_brd_name_by_type(adapter->ahw.board_type, brd_name);



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

		pr_info("%s: %s Board S/N %s  Chip rev 0x%x\n",

				module_name(THIS_MODULE),

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

	}
@@ -1213,16 +1213,10 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	int pci_func_id = PCI_FUNC(pdev->devfn);

	uint8_t revision_id;



	if (pdev->class != 0x020000) {

		printk(KERN_DEBUG "NetXen function %d, class %x will not "

				"be enabled.\n",pci_func_id, pdev->class);

		return -ENODEV;

	}



	if (pdev->revision >= NX_P3_A0 && pdev->revision < NX_P3_B1) {

		printk(KERN_WARNING "NetXen chip revisions between 0x%x-0x%x"

		pr_warning("%s: chip revisions between 0x%x-0x%x"

				"will not be enabled.\n",

				NX_P3_A0, NX_P3_B1);

				module_name(THIS_MODULE), NX_P3_A0, NX_P3_B1);

		return -ENODEV;

	}