Skip to content

Commit

Permalink
ixgbe: remove unneeded ipsec test in TX path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shannon Nelson authored and Jeff Kirsher committed Mar 23, 2018
1 parent 2137aec commit 871dd09
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 871dd09

Please sign in to comment.