Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e0c5648 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Minor formatting and comment corrections for ixgbe_xmit_frame_ring 



This patch is meant to address several minor issues in
ixgbe_xmit_frame_ring.  Specifically it adds a comment explaining the TXSW
flag, and correctly wraps a line over 80 characters.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent bb9c5ee1

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+11 −6
Original line number Diff line number Diff line
@@ -7012,11 +7012,6 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
		return NETDEV_TX_BUSY;

	}



#ifdef CONFIG_PCI_IOV

	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

		tx_flags |= IXGBE_TX_FLAGS_TXSW;



#endif

	/* if we have a HW VLAN tag being added default to the HW one */

	if (vlan_tx_tag_present(skb)) {

		tx_flags |= vlan_tx_tag_get(skb) << IXGBE_TX_FLAGS_VLAN_SHIFT;
@@ -7029,10 +7024,20 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
			goto out_drop;



		protocol = vhdr->h_vlan_encapsulated_proto;

		tx_flags |= ntohs(vhdr->h_vlan_TCI) << IXGBE_TX_FLAGS_VLAN_SHIFT;

		tx_flags |= ntohs(vhdr->h_vlan_TCI) <<

				  IXGBE_TX_FLAGS_VLAN_SHIFT;

		tx_flags |= IXGBE_TX_FLAGS_SW_VLAN;

	}



#ifdef CONFIG_PCI_IOV

	/*

	 * Use the l2switch_enable flag - would be false if the DMA

	 * Tx switch had been disabled.

	 */

	if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)

		tx_flags |= IXGBE_TX_FLAGS_TXSW;



#endif

	/* DCB maps skb priorities 0-7 onto 3 bit PCP of VLAN tag. */

	if ((adapter->flags & IXGBE_FLAG_DCB_ENABLED) &&

	    ((tx_flags & (IXGBE_TX_FLAGS_HW_VLAN | IXGBE_TX_FLAGS_SW_VLAN)) ||