diff options
| author | Sritej Velaga <sritej.velaga@qlogic.com> | 2010-06-17 02:56:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-17 08:57:55 -0700 |
| commit | 7f9a0c34d26b1ce8a512555ca144e622dea4dc44 (patch) | |
| tree | e32a43810843570b0f07cfd1c5d5279a7052ce43 | |
| parent | 469c221f97879c0e01967df813ab58dab1d5d64a (diff) | |
| download | kernel_samsung_crespo-7f9a0c34d26b1ce8a512555ca144e622dea4dc44.zip kernel_samsung_crespo-7f9a0c34d26b1ce8a512555ca144e622dea4dc44.tar.gz kernel_samsung_crespo-7f9a0c34d26b1ce8a512555ca144e622dea4dc44.tar.bz2 | |
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.c | 5 | ||||
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/qlcnic/qlcnic_ctx.c b/drivers/net/qlcnic/qlcnic_ctx.c index 42feb23..90ed6fb 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) 0, QLCNIC_CDRP_CMD_MAC_ADDRESS); - if (err == QLCNIC_RCODE_SUCCESS) { + if (err == QLCNIC_RCODE_SUCCESS) qlcnic_fetch_mac(adapter, QLCNIC_ARG1_CRB_OFFSET, QLCNIC_ARG2_CRB_OFFSET, 0, mac); - dev_info(&adapter->pdev->dev, "MAC address: %pM\n", mac); - } else { + else { dev_err(&adapter->pdev->dev, "Failed to get mac address%d\n", err); err = -EIO; diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 128a0a7..28ed28c 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -35,14 +35,14 @@ #include <linux/inetdevice.h> #include <linux/sysfs.h> -MODULE_DESCRIPTION("QLogic 10 GbE Converged Ethernet Driver"); +MODULE_DESCRIPTION("QLogic 1/10 GbE Converged/Intelligent Ethernet Driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(QLCNIC_LINUX_VERSIONID); MODULE_FIRMWARE(QLCNIC_UNIFIED_ROMIMAGE_NAME); char qlcnic_driver_name[] = "qlcnic"; -static const char qlcnic_driver_string[] = "QLogic Converged Ethernet Driver v" - QLCNIC_LINUX_VERSIONID; +static const char qlcnic_driver_string[] = "QLogic 1/10 GbE " + "Converged/Intelligent Ethernet Driver v" QLCNIC_LINUX_VERSIONID; static int port_mode = QLCNIC_PORT_MODE_AUTO_NEG; @@ -661,7 +661,7 @@ static void get_brd_name(struct qlcnic_adapter *adapter, char *name) } if (!found) - name = "Unknown"; + sprintf(name, "%pM Gigabit Ethernet", adapter->mac_addr); } static void |