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

Commit 9c883bd3 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e/i40evf: remove unused tunnel parameter 



Code was moved into a separate function some time ago.

Change-ID: Icabbe71ce05cf5d716d3e1152cdd9cd41d11bcb5
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent de125aae

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

+4 −7
Original line number Diff line number Diff line
@@ -2186,14 +2186,12 @@ static inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb, 
 * @tx_ring:  ptr to the ring to send

 * @skb:      ptr to the skb we're sending

 * @hdr_len:  ptr to the size of the packet header

 * @cd_type_cmd_tso_mss: ptr to u64 object

 * @cd_tunneling: ptr to context descriptor bits

 * @cd_type_cmd_tso_mss: Quad Word 1

 *

 * Returns 0 if no TSO can happen, 1 if tso is going, or error

 **/

static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,

		    u8 *hdr_len, u64 *cd_type_cmd_tso_mss,

		    u32 *cd_tunneling)

		    u8 *hdr_len, u64 *cd_type_cmd_tso_mss)

{

	u32 cd_cmd, cd_tso_len, cd_mss;

	struct ipv6hdr *ipv6h;
@@ -2246,7 +2244,7 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, 
 * @tx_ring:  ptr to the ring to send

 * @skb:      ptr to the skb we're sending

 * @tx_flags: the collected send information

 * @cd_type_cmd_tso_mss: ptr to u64 object

 * @cd_type_cmd_tso_mss: Quad Word 1

 *

 * Returns 0 if no Tx timestamp can happen and 1 if the timestamp will happen

 **/
@@ -2825,8 +2823,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, 
	else if (protocol == htons(ETH_P_IPV6))

		tx_flags |= I40E_TX_FLAGS_IPV6;



	tso = i40e_tso(tx_ring, skb, &hdr_len,

		       &cd_type_cmd_tso_mss, &cd_tunneling);

	tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss);



	if (tso < 0)

		goto out_drop;

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

+3 −5
Original line number Diff line number Diff line
@@ -1436,13 +1436,12 @@ static inline int i40evf_tx_prepare_vlan_flags(struct sk_buff *skb, 
 * @tx_ring:  ptr to the ring to send

 * @skb:      ptr to the skb we're sending

 * @hdr_len:  ptr to the size of the packet header

 * @cd_tunneling: ptr to context descriptor bits

 * @cd_type_cmd_tso_mss: Quad Word 1

 *

 * Returns 0 if no TSO can happen, 1 if tso is going, or error

 **/

static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,

		    u8 *hdr_len, u64 *cd_type_cmd_tso_mss,

		    u32 *cd_tunneling)

		    u8 *hdr_len, u64 *cd_type_cmd_tso_mss)

{

	u32 cd_cmd, cd_tso_len, cd_mss;

	struct ipv6hdr *ipv6h;
@@ -1979,8 +1978,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, 
	else if (protocol == htons(ETH_P_IPV6))

		tx_flags |= I40E_TX_FLAGS_IPV6;



	tso = i40e_tso(tx_ring, skb, &hdr_len,

		       &cd_type_cmd_tso_mss, &cd_tunneling);

	tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss);



	if (tso < 0)

		goto out_drop;