All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Shannon Nelson <shannon.nelson@oracle.com>,
	netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
	jogreene@redhat.com, Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 04/12] ixgbe: remove unneeded ipsec test in TX path
Date: Fri, 23 Mar 2018 16:16:23 -0700	[thread overview]
Message-ID: <20180323231631.32502-5-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <20180323231631.32502-1-jeffrey.t.kirsher@intel.com>

From: Shannon Nelson <shannon.nelson@oracle.com>

Since the ipsec data fields will be zero anyway in the non-ipsec
case, we can remove the conditional jump.

Suggested-by: Alexander Duyck <alexander.duyck@gmail.com>
Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 0eb45d1cd0b2..74da310378da 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7873,10 +7873,8 @@ static void ixgbe_tx_csum(struct ixgbe_ring *tx_ring,
 	vlan_macip_lens |= skb_network_offset(skb) << IXGBE_ADVTXD_MACLEN_SHIFT;
 	vlan_macip_lens |= first->tx_flags & IXGBE_TX_FLAGS_VLAN_MASK;
 
-	if (first->tx_flags & IXGBE_TX_FLAGS_IPSEC) {
-		fceof_saidx |= itd->sa_idx;
-		type_tucmd |= itd->flags | itd->trailer_len;
-	}
+	fceof_saidx |= itd->sa_idx;
+	type_tucmd |= itd->flags | itd->trailer_len;
 
 	ixgbe_tx_ctxtdesc(tx_ring, vlan_macip_lens, fceof_saidx, type_tucmd, 0);
 }
-- 
2.14.3

  parent reply	other threads:[~2018-03-23 23:16 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-23 23:16 [net-next 00/12][pull request] 10GbE Intel Wired LAN Driver Updates 2018-03-23 Jeff Kirsher
2018-03-23 23:16 ` [net-next 01/12] ixgbe: add status reg reads to ixgbe_check_remove Jeff Kirsher
2018-03-23 23:16 ` [net-next 02/12] ixgbe: fix read-modify-write in x550 phy setup Jeff Kirsher
2018-03-23 23:16 ` [net-next 03/12] ixgbe: no need for ipsec csum feature check Jeff Kirsher
2018-03-23 23:16 ` Jeff Kirsher [this message]
2018-03-23 23:16 ` [net-next 05/12] ixgbe: no need for esp trailer if GSO Jeff Kirsher
2018-03-23 23:16 ` [net-next 06/12] ixgbe: enable TSO with IPsec offload Jeff Kirsher
2018-03-23 23:16 ` [net-next 07/12] ixgbevf: Add XDP support for pass and drop actions Jeff Kirsher
2018-03-23 23:16 ` [net-next 08/12] ixgbevf: Add support for XDP_TX action Jeff Kirsher
2018-03-23 23:16 ` [net-next 09/12] ixgbevf: Delay tail write for XDP packets Jeff Kirsher
2018-03-23 23:16 ` [net-next 10/12] ixgbevf: Add support for meta data Jeff Kirsher
2018-03-23 23:16 ` [net-next 11/12] ixgbevf: Add XDP queue stats reporting Jeff Kirsher
2018-03-23 23:16 ` [net-next 12/12] ixgbe: tweak page counting for XDP_REDIRECT Jeff Kirsher
2018-03-25 20:26 ` [net-next 00/12][pull request] 10GbE Intel Wired LAN Driver Updates 2018-03-23 David Miller

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=20180323231631.32502-5-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=jogreene@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=nhorman@redhat.com \
    --cc=sassmann@redhat.com \
    --cc=shannon.nelson@oracle.com \
    /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.