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

Commit 03f9d6a5 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

i40e/i40evf: Use u64 values instead of casting them in TSO function 



Instead of casing u32 values to u64 it makes more sense to just start out
with u64 values in the first place.  This way we don't need to create a
mess with all of the casts needed to populate a 64b value.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a9c9a81f

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+4 −5
Original line number Diff line number Diff line
@@ -2267,7 +2267,7 @@ static inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb, 
static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,

		    u8 *hdr_len, u64 *cd_type_cmd_tso_mss)

{

	u32 cd_cmd, cd_tso_len, cd_mss;

	u64 cd_cmd, cd_tso_len, cd_mss;

	struct ipv6hdr *ipv6h;

	struct tcphdr *tcph;

	struct iphdr *iph;
@@ -2309,10 +2309,9 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, 
	cd_cmd = I40E_TX_CTX_DESC_TSO;

	cd_tso_len = skb->len - *hdr_len;

	cd_mss = skb_shinfo(skb)->gso_size;

	*cd_type_cmd_tso_mss |= ((u64)cd_cmd << I40E_TXD_CTX_QW1_CMD_SHIFT) |

				((u64)cd_tso_len <<

				 I40E_TXD_CTX_QW1_TSO_LEN_SHIFT) |

				((u64)cd_mss << I40E_TXD_CTX_QW1_MSS_SHIFT);

	*cd_type_cmd_tso_mss |= (cd_cmd << I40E_TXD_CTX_QW1_CMD_SHIFT) |

				(cd_tso_len << I40E_TXD_CTX_QW1_TSO_LEN_SHIFT) |

				(cd_mss << I40E_TXD_CTX_QW1_MSS_SHIFT);

	return 1;

}

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+4 −5
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ static inline int i40evf_tx_prepare_vlan_flags(struct sk_buff *skb, 
static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,

		    u8 *hdr_len, u64 *cd_type_cmd_tso_mss)

{

	u32 cd_cmd, cd_tso_len, cd_mss;

	u64 cd_cmd, cd_tso_len, cd_mss;

	struct ipv6hdr *ipv6h;

	struct tcphdr *tcph;

	struct iphdr *iph;
@@ -1569,10 +1569,9 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, 
	cd_cmd = I40E_TX_CTX_DESC_TSO;

	cd_tso_len = skb->len - *hdr_len;

	cd_mss = skb_shinfo(skb)->gso_size;

	*cd_type_cmd_tso_mss |= ((u64)cd_cmd << I40E_TXD_CTX_QW1_CMD_SHIFT) |

				((u64)cd_tso_len <<

				 I40E_TXD_CTX_QW1_TSO_LEN_SHIFT) |

				((u64)cd_mss << I40E_TXD_CTX_QW1_MSS_SHIFT);

	*cd_type_cmd_tso_mss |= (cd_cmd << I40E_TXD_CTX_QW1_CMD_SHIFT) |

				(cd_tso_len << I40E_TXD_CTX_QW1_TSO_LEN_SHIFT) |

				(cd_mss << I40E_TXD_CTX_QW1_MSS_SHIFT);

	return 1;

}