aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSritej Velaga <sritej.velaga@qlogic.com>2010-06-16 22:56:39 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-17 11:57:55 -0400
commit7f9a0c34d26b1ce8a512555ca144e622dea4dc44 (patch)
treee32a43810843570b0f07cfd1c5d5279a7052ce43
parent469c221f97879c0e01967df813ab58dab1d5d64a (diff)
qlcnic: change driver description
o Remove extra printing of mac address o This driver also supports NIC only Qlogic adapters. Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com> Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/qlcnic/qlcnic_ctx.c5
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/qlcnic/qlcnic_ctx.c
index 42feb23dec1d..90ed6fbaee34 100644
--- a/drivers/net/qlcnic/qlcnic_ctx.c
+++ b/drivers/net/qlcnic/qlcnic_ctx.c
@@ -589,11 +589,10 @@ int qlcnic_get_mac_address(struct qlcnic_adapter *adapter, u8 *mac)
589 0, 589 0,
590 QLCNIC_CDRP_CMD_MAC_ADDRESS); 590 QLCNIC_CDRP_CMD_MAC_ADDRESS);
591 591
592 if (err == QLCNIC_RCODE_SUCCESS) { 592 if (err == QLCNIC_RCODE_SUCCESS)
593 qlcnic_fetch_mac(adapter, QLCNIC_ARG1_CRB_OFFSET, 593 qlcnic_fetch_mac(adapter, QLCNIC_ARG1_CRB_OFFSET,
594 QLCNIC_ARG2_CRB_OFFSET, 0, mac); 594 QLCNIC_ARG2_CRB_OFFSET, 0, mac);
595 dev_info(&adapter->pdev->dev, "MAC address: %pM\n", mac); 595 else {
596 } else {
597 dev_err(&adapter->pdev->dev, 596 dev_err(&adapter->pdev->dev,
598 "Failed to get mac address%d\n", err); 597 "Failed to get mac address%d\n", err);
599 err = -EIO; 598 err = -EIO;
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index 128a0a72a234..28ed28c1cbcc 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -35,14 +35,14 @@
35#include <linux/inetdevice.h> 35#include <linux/inetdevice.h>
36#include <linux/sysfs.h> 36#include <linux/sysfs.h>
37 37
38MODULE_DESCRIPTION("QLogic 10 GbE Converged Ethernet Driver"); 38MODULE_DESCRIPTION("QLogic 1/10 GbE Converged/Intelligent Ethernet Driver");
39MODULE_LICENSE("GPL"); 39MODULE_LICENSE("GPL");
40MODULE_VERSION(QLCNIC_LINUX_VERSIONID); 40MODULE_VERSION(QLCNIC_LINUX_VERSIONID);
41MODULE_FIRMWARE(QLCNIC_UNIFIED_ROMIMAGE_NAME); 41MODULE_FIRMWARE(QLCNIC_UNIFIED_ROMIMAGE_NAME);
42 42
43char qlcnic_driver_name[] = "qlcnic"; 43char qlcnic_driver_name[] = "qlcnic";
44static const char qlcnic_driver_string[] = "QLogic Converged Ethernet Driver v" 44static const char qlcnic_driver_string[] = "QLogic 1/10 GbE "
45 QLCNIC_LINUX_VERSIONID; 45 "Converged/Intelligent Ethernet Driver v" QLCNIC_LINUX_VERSIONID;
46 46
47static int port_mode = QLCNIC_PORT_MODE_AUTO_NEG; 47static int port_mode = QLCNIC_PORT_MODE_AUTO_NEG;
48 48
@@ -661,7 +661,7 @@ static void get_brd_name(struct qlcnic_adapter *adapter, char *name)
661 } 661 }
662 662
663 if (!found) 663 if (!found)
664 name = "Unknown"; 664 sprintf(name, "%pM Gigabit Ethernet", adapter->mac_addr);
665} 665}
666 666
667static void 667static void