aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/ice/ice_txrx.c
diff options
context:
space:
mode:
authorChinh T Cao <chinh.t.cao@intel.com>2020-11-20 16:39:35 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-14 08:42:05 +0200
commitfd92e7aacc16de471fde6afa8b49d6dfff0dc029 (patch)
tree5cee38f104eeb5ad5f041631eb444566b880ca87 /drivers/net/ethernet/intel/ice/ice_txrx.c
parent4a78ae12780394cae396ef4e8e94252271363363 (diff)
downloadkernel_replicant_linux-fd92e7aacc16de471fde6afa8b49d6dfff0dc029.tar.gz
kernel_replicant_linux-fd92e7aacc16de471fde6afa8b49d6dfff0dc029.tar.bz2
kernel_replicant_linux-fd92e7aacc16de471fde6afa8b49d6dfff0dc029.zip
ice: Refactor DCB related variables out of the ice_port_info struct
[ Upstream commit fc2d1165d4a424dd325ae1f45806565350a58013 ] Refactor the DCB related variables out of the ice_port_info_struct. The goal is to make the ice_port_info struct cleaner. Signed-off-by: Chinh T Cao <chinh.t.cao@intel.com> Co-developed-by: Dave Ertman <david.m.ertman@intel.com> 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_txrx.c')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_txrx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index af5b7f33db9a..0f2544c420ac 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -2421,7 +2421,7 @@ ice_xmit_frame_ring(struct sk_buff *skb, struct ice_ring *tx_ring)
/* allow CONTROL frames egress from main VSI if FW LLDP disabled */
if (unlikely(skb->priority == TC_PRIO_CONTROL &&
vsi->type == ICE_VSI_PF &&
- vsi->port_info->is_sw_lldp))
+ vsi->port_info->qos_cfg.is_sw_lldp))
offload.cd_qw1 |= (u64)(ICE_TX_DESC_DTYPE_CTX |
ICE_TX_CTX_DESC_SWTCH_UPLINK <<
ICE_TXD_CTX_QW1_CMD_S);