From: Bimmy Pujari <bimmy.pujari@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [next PATCH S61 08/10] i40e/i40evf: Clean-up process_skb_fields
Date: Tue, 21 Feb 2017 15:55:46 -0800 [thread overview]
Message-ID: <1487721348-25617-9-git-send-email-bimmy.pujari@intel.com> (raw)
In-Reply-To: <1487721348-25617-1-git-send-email-bimmy.pujari@intel.com>
From: Alexander Duyck <alexander.h.duyck@intel.com>
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.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Change-ID: I0b4668a34d90b61b66ded7c7c26e19a3e2d06251
---
Testing Hints:
Basically just need to verify this builds and processes Rx
checksums correctly.
drivers/net/ethernet/intel/i40e/i40e_txrx.c | 8 +++-----
drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 558d7da..a540754 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -1431,8 +1431,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,
@@ -1598,12 +1596,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);
}
/**
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 9b9314a..7f02f62 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -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);
}
/**
--
2.4.11
next prev parent reply other threads:[~2017-02-21 23:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-21 23:55 [Intel-wired-lan] [next PATCH S61 00/10] i40e/i40evf updates Bimmy Pujari
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 01/10] i40e/i40evf: Update code to better handle incrementing page count Bimmy Pujari
2017-03-07 16:24 ` Bowers, AndrewX
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 02/10] i40e: fix configuration of RSS table with DCB Bimmy Pujari
2017-03-07 16:25 ` Bowers, AndrewX
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 03/10] i40e/i40evf: Fix use after free in Rx cleanup path Bimmy Pujari
2017-03-08 18:55 ` Bowers, AndrewX
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 04/10] i40e: Fixed race conditions in VF reset Bimmy Pujari
2017-03-13 14:50 ` Bowers, AndrewX
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 05/10] i40e: Add support for 25G in ethtool Bimmy Pujari
2017-03-06 1:10 ` Jeff Kirsher
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 06/10] i40e: fix for queue timing delays Bimmy Pujari
2017-03-07 16:29 ` Bowers, AndrewX
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 07/10] i40e: removed no longer needed delays Bimmy Pujari
2017-03-07 16:30 ` Bowers, AndrewX
2017-02-21 23:55 ` Bimmy Pujari [this message]
2017-03-07 16:30 ` [Intel-wired-lan] [next PATCH S61 08/10] i40e/i40evf: Clean-up process_skb_fields Bowers, AndrewX
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 09/10] i40e: Drop FCoE code from core driver files Bimmy Pujari
2017-03-07 16:31 ` Bowers, AndrewX
2017-02-21 23:55 ` [Intel-wired-lan] [next PATCH S61 10/10] i40e: Drop FCoE code that always evaluates to false or 0 Bimmy Pujari
2017-03-07 16:32 ` Bowers, AndrewX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487721348-25617-9-git-send-email-bimmy.pujari@intel.com \
--to=bimmy.pujari@intel.com \
--cc=intel-wired-lan@osuosl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.