Commit bc1cbd34 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller

igb: misc cleanup to combine one if statement

This patch combines a pair of if statements into one.
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56fbbb4e
...@@ -3133,8 +3133,8 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb, ...@@ -3133,8 +3133,8 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb,
if (tso) if (tso)
tx_flags |= IGB_TX_FLAGS_TSO; tx_flags |= IGB_TX_FLAGS_TSO;
else if (igb_tx_csum_adv(adapter, tx_ring, skb, tx_flags)) else if (igb_tx_csum_adv(adapter, tx_ring, skb, tx_flags) &&
if (skb->ip_summed == CHECKSUM_PARTIAL) (skb->ip_summed == CHECKSUM_PARTIAL))
tx_flags |= IGB_TX_FLAGS_CSUM; tx_flags |= IGB_TX_FLAGS_CSUM;
igb_tx_queue_adv(adapter, tx_ring, tx_flags, igb_tx_queue_adv(adapter, tx_ring, tx_flags,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment