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

Commit 62748b7b authored by Alexander Duyck's avatar Alexander Duyck Committed by Peter P Waskiewicz Jr
Browse files

ixgbe: Rewrite code related to configuring IFCS bit in Tx descriptor 



This change updates the code related to configuring the transmit frame
checksum.  Specifically I have updated the code so that we can only skip
inserting the checksum in the case that we are not performing some other
offload that will modify the frame data.

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 avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
parent 5a02cbd1

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#define IXGBE_TX_FLAGS_FSO		(u32)(1 << 6)

#define IXGBE_TX_FLAGS_TXSW		(u32)(1 << 7)

#define IXGBE_TX_FLAGS_TSTAMP		(u32)(1 << 8)

#define IXGBE_TX_FLAGS_NO_IFCS		(u32)(1 << 9)

#define IXGBE_TX_FLAGS_VLAN_MASK	0xffff0000

#define IXGBE_TX_FLAGS_VLAN_PRIO_MASK	0xe0000000

#define IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT  29

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

+10 −6
Original line number Diff line number Diff line
@@ -5903,9 +5903,12 @@ static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring, 
	u32 type_tucmd = 0;



	if (skb->ip_summed != CHECKSUM_PARTIAL) {

		if (!(first->tx_flags & IXGBE_TX_FLAGS_HW_VLAN) &&

		    !(first->tx_flags & IXGBE_TX_FLAGS_TXSW))

		if (!(first->tx_flags & IXGBE_TX_FLAGS_HW_VLAN)) {

			if (unlikely(skb->no_fcs))

				first->tx_flags |= IXGBE_TX_FLAGS_NO_IFCS;

			if (!(first->tx_flags & IXGBE_TX_FLAGS_TXSW))

				return;

		}

	} else {

		u8 l4_hdr = 0;

		switch (first->protocol) {
@@ -5967,7 +5970,6 @@ static __le32 ixgbe_tx_cmd_type(u32 tx_flags) 
{

	/* set type for advanced descriptor with frame checksum insertion */

	__le32 cmd_type = cpu_to_le32(IXGBE_ADVTXD_DTYP_DATA |

				      IXGBE_ADVTXD_DCMD_IFCS |

				      IXGBE_ADVTXD_DCMD_DEXT);



	/* set HW vlan bit if vlan is present */
@@ -5987,6 +5989,10 @@ static __le32 ixgbe_tx_cmd_type(u32 tx_flags) 
#endif

		cmd_type |= cpu_to_le32(IXGBE_ADVTXD_DCMD_TSE);



	/* insert frame checksum */

	if (!(tx_flags & IXGBE_TX_FLAGS_NO_IFCS))

		cmd_type |= cpu_to_le32(IXGBE_ADVTXD_DCMD_IFCS);



	return cmd_type;

}
@@ -6092,8 +6098,6 @@ static void ixgbe_tx_map(struct ixgbe_ring *tx_ring, 
		if (likely(!data_len))

			break;



		if (unlikely(skb->no_fcs))

			cmd_type &= ~(cpu_to_le32(IXGBE_ADVTXD_DCMD_IFCS));

		tx_desc->read.cmd_type_len = cmd_type | cpu_to_le32(size);



		i++;