diff options
| author | Dave Ertman <david.m.ertman@intel.com> | 2020-11-20 16:38:35 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-04 11:38:17 +0100 |
| commit | 70bcfea70f12a72b67e868f474e9512c5ec6ae21 (patch) | |
| tree | 6d9bf7609b4eef84993a5aa2385c6434c1b9a19d /drivers/net/ethernet/intel/ice/ice.h | |
| parent | 09a2fee495467a641312837d495e99f0f40d12a7 (diff) | |
| download | kernel_replicant_linux-70bcfea70f12a72b67e868f474e9512c5ec6ae21.tar.gz kernel_replicant_linux-70bcfea70f12a72b67e868f474e9512c5ec6ae21.tar.bz2 kernel_replicant_linux-70bcfea70f12a72b67e868f474e9512c5ec6ae21.zip | |
ice: Fix state bits on LLDP mode switch
[ Upstream commit 0d4907f65dc8fc5e897ad19956fca1acb3b33bc8 ]
DCBX_CAP bits were not being adjusted when switching
between SW and FW controlled LLDP.
Adjust bits to correctly indicate which mode the
LLDP logic is in.
Fixes: b94b013eb626 ("ice: Implement DCBNL support")
Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice.h')
| -rw-r--r-- | drivers/net/ethernet/intel/ice/ice.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h index 54cf382fddaf..5b3f2bb22eba 100644 --- a/drivers/net/ethernet/intel/ice/ice.h +++ b/drivers/net/ethernet/intel/ice/ice.h @@ -444,9 +444,7 @@ struct ice_pf { struct ice_hw_port_stats stats_prev; struct ice_hw hw; u8 stat_prev_loaded:1; /* has previous stats been loaded */ -#ifdef CONFIG_DCB u16 dcbx_cap; -#endif /* CONFIG_DCB */ u32 tx_timeout_count; unsigned long tx_timeout_last_recovery; u32 tx_timeout_recovery_level; |