From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [PATCH S31 13/15] ice: Get rid of ice_cleanup_header
Date: Wed, 9 Oct 2019 07:09:51 -0700 [thread overview]
Message-ID: <20191009140953.14087-13-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20191009140953.14087-1-anthony.l.nguyen@intel.com>
From: Krzysztof Kazimierczak <krzysztof.kazimierczak@intel.com>
ice_cleanup_hdrs() has been stripped of most of its content, it only serves
as a wrapper for eth_skb_pad(). We can get rid of it altogether and
simplify the codebase.
Signed-off-by: Krzysztof Kazimierczak <krzysztof.kazimierczak@intel.com>
---
drivers/net/ethernet/intel/ice/ice_txrx.c | 27 ++---------------------
1 file changed, 2 insertions(+), 25 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index 8e3a69d3884d..96b13421e449 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -944,27 +944,6 @@ static void ice_put_rx_buf(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf)
rx_buf->skb = NULL;
}
-/**
- * ice_cleanup_headers - Correct empty headers
- * @skb: pointer to current skb being fixed
- *
- * Also address the case where we are pulling data in on pages only
- * and as such no data is present in the skb header.
- *
- * In addition if skb is not at least 60 bytes we need to pad it so that
- * it is large enough to qualify as a valid Ethernet frame.
- *
- * Returns true if an error was encountered and skb was freed.
- */
-static bool ice_cleanup_headers(struct sk_buff *skb)
-{
- /* if eth_skb_pad returns an error the skb was freed */
- if (eth_skb_pad(skb))
- return true;
-
- return false;
-}
-
/**
* ice_is_non_eop - process handling of non-EOP buffers
* @rx_ring: Rx ring being processed
@@ -1124,10 +1103,8 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)
if (ice_test_staterr(rx_desc, stat_err_bits))
vlan_tag = le16_to_cpu(rx_desc->wb.l2tag1);
- /* correct empty headers and pad skb if needed (to make valid
- * ethernet frame
- */
- if (ice_cleanup_headers(skb)) {
+ /* pad the skb if needed, to make a valid ethernet frame */
+ if (eth_skb_pad(skb)) {
skb = NULL;
continue;
}
--
2.20.1
next prev parent reply other threads:[~2019-10-09 14:09 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 14:09 [Intel-wired-lan] [PATCH S31 01/15] ice: implement set_eeprom functionality Tony Nguyen
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 02/15] ice: add ethtool -m support for reading i2c eeprom modules Tony Nguyen
2019-10-16 16:17 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 03/15] ice: Add support for FW recovery mode detection Tony Nguyen
2019-10-16 16:17 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 04/15] ice: Update Boot Configuration Section read of NVM Tony Nguyen
2019-10-16 16:18 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 05/15] ice: handle DCBx non-contiguous TC request Tony Nguyen
2019-10-16 16:18 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 06/15] ice: fix driver unload flow Tony Nguyen
2019-10-16 16:20 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 07/15] ice: Adjust DCB INIT for SW mode Tony Nguyen
2019-10-16 16:20 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 08/15] ice: save PCI state in probe Tony Nguyen
2019-10-16 16:21 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 09/15] ice: Check for null pointer dereference when setting rings Tony Nguyen
2019-10-16 16:22 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 10/15] ice: write register with correct offset Tony Nguyen
2019-10-16 16:22 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 11/15] ice: print unsupported module message Tony Nguyen
2019-10-16 16:23 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 12/15] ice: print PCI link speed and width Tony Nguyen
2019-10-16 16:23 ` Bowers, AndrewX
2019-10-09 14:09 ` Tony Nguyen [this message]
2019-10-16 16:24 ` [Intel-wired-lan] [PATCH S31 13/15] ice: Get rid of ice_cleanup_header Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 14/15] ice: Rename VF function ice_vc_dis_vf to match its behavior Tony Nguyen
2019-10-16 16:24 ` Bowers, AndrewX
2019-10-09 14:09 ` [Intel-wired-lan] [PATCH S31 15/15] ice: Fix return value when SR-IOV is not supported Tony Nguyen
2019-10-16 16:25 ` Bowers, AndrewX
2019-10-16 16:16 ` [Intel-wired-lan] [PATCH S31 01/15] ice: implement set_eeprom functionality 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=20191009140953.14087-13-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox