aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-10-28 07:11:04 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-28 07:11:04 -0400
commitc25c0b9b33f681972e0b2abc96b9debdd1ef32a5 (patch)
tree24df63e3e848ccf0205be3774ffa451246308d66 /drivers/net/netxen
parentf0e08fac06596a760f074c08521550d93b96336e (diff)
netxen: update module info
Update module info with QLogic signature. Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 53e728907d5a..23e5264c8ae6 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -36,12 +36,12 @@
36#include <linux/inetdevice.h> 36#include <linux/inetdevice.h>
37#include <linux/sysfs.h> 37#include <linux/sysfs.h>
38 38
39MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver"); 39MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Converged Ethernet Driver");
40MODULE_LICENSE("GPL"); 40MODULE_LICENSE("GPL");
41MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID); 41MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
42 42
43char netxen_nic_driver_name[] = "netxen_nic"; 43char netxen_nic_driver_name[] = "netxen_nic";
44static char netxen_nic_driver_string[] = "NetXen Network Driver version " 44static char netxen_nic_driver_string[] = "QLogic/NetXen Network Driver v"
45 NETXEN_NIC_LINUX_VERSIONID; 45 NETXEN_NIC_LINUX_VERSIONID;
46 46
47static int port_mode = NETXEN_PORT_MODE_AUTO_NEG; 47static int port_mode = NETXEN_PORT_MODE_AUTO_NEG;
@@ -55,7 +55,6 @@ static int use_msi_x = 1;
55 55
56static unsigned long auto_fw_reset = AUTO_FW_RESET_ENABLED; 56static unsigned long auto_fw_reset = AUTO_FW_RESET_ENABLED;
57 57
58/* Local functions to NetXen NIC driver */
59static int __devinit netxen_nic_probe(struct pci_dev *pdev, 58static int __devinit netxen_nic_probe(struct pci_dev *pdev,
60 const struct pci_device_id *ent); 59 const struct pci_device_id *ent);
61static void __devexit netxen_nic_remove(struct pci_dev *pdev); 60static void __devexit netxen_nic_remove(struct pci_dev *pdev);
@@ -731,7 +730,8 @@ netxen_check_options(struct netxen_adapter *adapter)
731 if (adapter->portnum == 0) { 730 if (adapter->portnum == 0) {
732 get_brd_name_by_type(adapter->ahw.board_type, brd_name); 731 get_brd_name_by_type(adapter->ahw.board_type, brd_name);
733 732
734 printk(KERN_INFO "NetXen %s Board S/N %s Chip rev 0x%x\n", 733 pr_info("%s: %s Board S/N %s Chip rev 0x%x\n",
734 module_name(THIS_MODULE),
735 brd_name, serial_num, adapter->ahw.revision_id); 735 brd_name, serial_num, adapter->ahw.revision_id);
736 } 736 }
737 737
@@ -1213,16 +1213,10 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1213 int pci_func_id = PCI_FUNC(pdev->devfn); 1213 int pci_func_id = PCI_FUNC(pdev->devfn);
1214 uint8_t revision_id; 1214 uint8_t revision_id;
1215 1215
1216 if (pdev->class != 0x020000) {
1217 printk(KERN_DEBUG "NetXen function %d, class %x will not "
1218 "be enabled.\n",pci_func_id, pdev->class);
1219 return -ENODEV;
1220 }
1221
1222 if (pdev->revision >= NX_P3_A0 && pdev->revision < NX_P3_B1) { 1216 if (pdev->revision >= NX_P3_A0 && pdev->revision < NX_P3_B1) {
1223 printk(KERN_WARNING "NetXen chip revisions between 0x%x-0x%x" 1217 pr_warning("%s: chip revisions between 0x%x-0x%x"
1224 "will not be enabled.\n", 1218 "will not be enabled.\n",
1225 NX_P3_A0, NX_P3_B1); 1219 module_name(THIS_MODULE), NX_P3_A0, NX_P3_B1);
1226 return -ENODEV; 1220 return -ENODEV;
1227 } 1221 }
1228 1222