diff mbox

[net-next,3/9] qlcnic: Add identifying string for 83xx adapter

Message ID 1365874114-6759-4-git-send-email-shahed.shaikh@qlogic.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Shahed Shaikh April 13, 2013, 5:28 p.m. UTC
From: Himanshu Madhani <himanshu.madhani@qlogic.com>

Added description for Hilda 8300 Series of Adapters.

Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c |   31 ++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

Comments

Francois Romieu April 14, 2013, 10:55 a.m. UTC | #1
Shahed Shaikh <shahed.shaikh@qlogic.com> :
[...]
> diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
> index 0d00b2b..424a5e0 100644
> --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
> +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
> @@ -156,6 +156,37 @@ static const u32 qlcnic_reg_tbl[] = {
>  };
>  
>  static const struct qlcnic_board_info qlcnic_boards[] = {
> +	{0x1077, 0x8030, 0x1077, 0x24e,

You may consider adding a space after the curly brace at a later time.

> +	 "8300 Series Dual Port 10GbE Converged Network Adapter "
> +	 "(TCP/IP Networking)"},
> +	{0x1077, 0x8030, 0x1077, 0x243,

0x1077 is also known as PCI_VENDOR_ID_QLOGIC.

You should imho use a macro to factor out the vendor.

At your choice, you may:
1. try a second macro to paste "Converged Network Adapter (TCP/IP Networking)"
2. save some kernel memory through replacement of
   short_name[QLCNIC_MAX_BOARD_NAME_LEN] (short indeed :o) ) by a char **.

Nit: rework qlcnic_get_board_name to avoid its sprintf and 
     QLCNIC_MAX_BOARD_NAME_LEN sized string in qlcnic_probe.
diff mbox

Patch

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 0d00b2b..424a5e0 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -156,6 +156,37 @@  static const u32 qlcnic_reg_tbl[] = {
 };
 
 static const struct qlcnic_board_info qlcnic_boards[] = {
+	{0x1077, 0x8030, 0x1077, 0x24e,
+	 "8300 Series Dual Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x243,
+	 "8300 Series Single Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x24a,
+	 "8300 Series Dual Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x246,
+	 "8300 Series Dual Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x252,
+	 "8300 Series Dual Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x26e,
+	 "8300 Series Dual Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x260,
+	 "8300 Series Dual Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x266,
+	 "8300 Series Single Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x269,
+	 "8300 Series Dual Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x1077, 0x271,
+	 "8300 Series Dual Port 10GbE Converged Network Adapter "
+	 "(TCP/IP Networking)"},
+	{0x1077, 0x8030, 0x0, 0x0, "8300 Series 1/10GbE Controller"},
 	{0x1077, 0x8020, 0x1077, 0x203,
 	 "8200 Series Single Port 10GbE Converged Network Adapter"
 	 "(TCP/IP Networking)"},