openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i40e: simplify member variable accesses 

This commit replaces usage of vsi->back in i40e_print_link_message()
(which is actually a PF pointer) with temp variable.

Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Sudheer Mogilappagari 2017-07-14 09:10:18 -04:00 committed by Jeff Kirsher
parent 9a03449d3e
commit 3fded4663b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -5346,13 +5346,14 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)
void i40e_print_link_message(struct i40e_vsi *vsi, bool isup) void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
{ {
enum i40e_aq_link_speed new_speed; enum i40e_aq_link_speed new_speed;
struct i40e_pf *pf = vsi->back;
char *speed = "Unknown"; char *speed = "Unknown";
char *fc = "Unknown"; char *fc = "Unknown";
char *fec = ""; char *fec = "";
char *req_fec = ""; char *req_fec = "";
char *an = ""; char *an = "";
new_speed = vsi->back->hw.phy.link_info.link_speed; new_speed = pf->hw.phy.link_info.link_speed;
if ((vsi->current_isup == isup) && (vsi->current_speed == new_speed)) if ((vsi->current_isup == isup) && (vsi->current_speed == new_speed))
return; return;
@ -5366,13 +5367,13 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
/* Warn user if link speed on NPAR enabled partition is not at /* Warn user if link speed on NPAR enabled partition is not at
* least 10GB * least 10GB
*/ */
if (vsi->back->hw.func_caps.npar_enable && if (pf->hw.func_caps.npar_enable &&
(vsi->back->hw.phy.link_info.link_speed == I40E_LINK_SPEED_1GB || (pf->hw.phy.link_info.link_speed == I40E_LINK_SPEED_1GB ||
vsi->back->hw.phy.link_info.link_speed == I40E_LINK_SPEED_100MB)) pf->hw.phy.link_info.link_speed == I40E_LINK_SPEED_100MB))
netdev_warn(vsi->netdev, netdev_warn(vsi->netdev,
"The partition detected link speed that is less than 10Gbps\n"); "The partition detected link speed that is less than 10Gbps\n");
switch (vsi->back->hw.phy.link_info.link_speed) { switch (pf->hw.phy.link_info.link_speed) {
case I40E_LINK_SPEED_40GB: case I40E_LINK_SPEED_40GB:
speed = "40 G"; speed = "40 G";
break; break;
@ -5395,7 +5396,7 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
break; break;
} }
switch (vsi->back->hw.fc.current_mode) { switch (pf->hw.fc.current_mode) {
case I40E_FC_FULL: case I40E_FC_FULL:
fc = "RX/TX"; fc = "RX/TX";
break; break;
@ -5410,18 +5411,18 @@ void i40e_print_link_message(struct i40e_vsi *vsi, bool isup)
break; break;
} }
if (vsi->back->hw.phy.link_info.link_speed == I40E_LINK_SPEED_25GB) { if (pf->hw.phy.link_info.link_speed == I40E_LINK_SPEED_25GB) {
req_fec = ", Requested FEC: None"; req_fec = ", Requested FEC: None";
fec = ", FEC: None"; fec = ", FEC: None";
an = ", Autoneg: False"; an = ", Autoneg: False";
if (vsi->back->hw.phy.link_info.an_info & I40E_AQ_AN_COMPLETED) if (pf->hw.phy.link_info.an_info & I40E_AQ_AN_COMPLETED)
an = ", Autoneg: True"; an = ", Autoneg: True";
if (vsi->back->hw.phy.link_info.fec_info & if (pf->hw.phy.link_info.fec_info &
I40E_AQ_CONFIG_FEC_KR_ENA) I40E_AQ_CONFIG_FEC_KR_ENA)
fec = ", FEC: CL74 FC-FEC/BASE-R"; fec = ", FEC: CL74 FC-FEC/BASE-R";
else if (vsi->back->hw.phy.link_info.fec_info & else if (pf->hw.phy.link_info.fec_info &
I40E_AQ_CONFIG_FEC_RS_ENA) I40E_AQ_CONFIG_FEC_RS_ENA)
fec = ", FEC: CL108 RS-FEC"; fec = ", FEC: CL108 RS-FEC";