i40e: fix missed "Negotiated" string in i40e_print_link_message()

The "Negotiated" string in i40e_print_link_message() function was missed.
This string has been added to the dmesg and small refactoring done removing
common substrings and unifying link status message format.
Without this patch it was not clear that FEC is related to negotiated FEC.

Signed-off-by: Aleksandr Loktionov <aleksandr.loktionov@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 3e2e465..700f38e 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -6569,19 +6569,19 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
        }
 
        if (pf->hw.phy.link_info.link_speed == I40E_LINK_SPEED_25GB) {
-               req_fec = ", Requested FEC: None";
-               fec = ", FEC: None";
-               an = ", Autoneg: False";
+               req_fec = "None";
+               fec = "None";
+               an = "False";
 
                if (pf->hw.phy.link_info.an_info & I40E_AQ_AN_COMPLETED)
-                       an = ", Autoneg: True";
+                       an = "True";
 
                if (pf->hw.phy.link_info.fec_info &
                    I40E_AQ_CONFIG_FEC_KR_ENA)
-                       fec = ", FEC: CL74 FC-FEC/BASE-R";
+                       fec = "CL74 FC-FEC/BASE-R";
                else if (pf->hw.phy.link_info.fec_info &
                         I40E_AQ_CONFIG_FEC_RS_ENA)
-                       fec = ", FEC: CL108 RS-FEC";
+                       fec = "CL108 RS-FEC";
 
                /* 'CL108 RS-FEC' should be displayed when RS is requested, or
                 * both RS and FC are requested
@@ -6590,13 +6590,14 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
                    (I40E_AQ_REQUEST_FEC_KR | I40E_AQ_REQUEST_FEC_RS)) {
                        if (vsi->back->hw.phy.link_info.req_fec_info &
                            I40E_AQ_REQUEST_FEC_RS)
-                               req_fec = ", Requested FEC: CL108 RS-FEC";
+                               req_fec = "CL108 RS-FEC";
                        else
-                               req_fec = ", Requested FEC: CL74 FC-FEC/BASE-R";
+                               req_fec = "CL74 FC-FEC/BASE-R";
                }
        }
 
-       netdev_info(vsi->netdev, "NIC Link is Up, %sbps Full Duplex%s%s%s, Flow Control: %s\n",
+       netdev_info(vsi->netdev,
+                   "NIC Link is Up, %sbps Full Duplex, Requested FEC: %s, Negotiated FEC: %s, Autoneg: %s, Flow Control: %s\n",
                    speed, req_fec, fec, an, fc);
 }