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

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

i40e/i40evf: Clean-up process_skb_fields 



This is a minor clean-up to make the i40e/i40evf process_skb_fields
function look a little more like what we have in igb.  The Rx checksum
function called out a need for skb->protocol but I can't see where it
actually needs it.  I am assuming this is something that was likely
refactored out some time ago as the Rx checksum code has gone through a few
rewrites.

Change-ID: I0b4668a34d90b61b66ded7c7c26e19a3e2d06251
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 0a25b731

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

+3 −5
Original line number Diff line number Diff line
@@ -1392,8 +1392,6 @@ bool i40e_alloc_rx_buffers(struct i40e_ring *rx_ring, u16 cleaned_count) 
 * @vsi: the VSI we care about

 * @skb: skb currently being received and modified

 * @rx_desc: the receive descriptor

 *

 * skb->protocol must be set before this function is called

 **/

static inline void i40e_rx_checksum(struct i40e_vsi *vsi,

				    struct sk_buff *skb,
@@ -1555,12 +1553,12 @@ void i40e_process_skb_fields(struct i40e_ring *rx_ring, 


	i40e_rx_hash(rx_ring, rx_desc, skb, rx_ptype);



	/* modifies the skb - consumes the enet header */

	skb->protocol = eth_type_trans(skb, rx_ring->netdev);



	i40e_rx_checksum(rx_ring->vsi, skb, rx_desc);



	skb_record_rx_queue(skb, rx_ring->queue_index);



	/* modifies the skb - consumes the enet header */

	skb->protocol = eth_type_trans(skb, rx_ring->netdev);

}



/**

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

+3 −5
Original line number Diff line number Diff line
@@ -764,8 +764,6 @@ bool i40evf_alloc_rx_buffers(struct i40e_ring *rx_ring, u16 cleaned_count) 
 * @vsi: the VSI we care about

 * @skb: skb currently being received and modified

 * @rx_desc: the receive descriptor

 *

 * skb->protocol must be set before this function is called

 **/

static inline void i40e_rx_checksum(struct i40e_vsi *vsi,

				    struct sk_buff *skb,
@@ -917,12 +915,12 @@ void i40evf_process_skb_fields(struct i40e_ring *rx_ring, 
{

	i40e_rx_hash(rx_ring, rx_desc, skb, rx_ptype);



	/* modifies the skb - consumes the enet header */

	skb->protocol = eth_type_trans(skb, rx_ring->netdev);



	i40e_rx_checksum(rx_ring->vsi, skb, rx_desc);



	skb_record_rx_queue(skb, rx_ring->queue_index);



	/* modifies the skb - consumes the enet header */

	skb->protocol = eth_type_trans(skb, rx_ring->netdev);

}



/**