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

Commit 84b07992 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e/i40evf: Drop unused tx_ring argument 



Some of the tx_ring arguments can be deleted since they are not used.

Change-ID: I99275b0f191d7f63ec2f05061919904940c36f31
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d1bd743b

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

+2 −4
Original line number Diff line number Diff line
@@ -2252,15 +2252,13 @@ static inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb, 


/**

 * i40e_tso - set up the tso context descriptor

 * @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: 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)

static int i40e_tso(struct sk_buff *skb, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)

{

	u64 cd_cmd, cd_tso_len, cd_mss;

	union {
@@ -2932,7 +2930,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);

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



	if (tso < 0)

		goto out_drop;

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

+2 −4
Original line number Diff line number Diff line
@@ -1519,15 +1519,13 @@ static inline int i40evf_tx_prepare_vlan_flags(struct sk_buff *skb, 


/**

 * i40e_tso - set up the tso context descriptor

 * @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: 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)

static int i40e_tso(struct sk_buff *skb, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)

{

	u64 cd_cmd, cd_tso_len, cd_mss;

	union {
@@ -2150,7 +2148,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);

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



	if (tso < 0)

		goto out_drop;