igb: misc cleanup to combine one if statement
Subsystems (2)
PATCH v2 4/6 igb: misc cleanup to combine one if statement
From: Alexander Duyck <[email protected]>
This patch combines a pair of if statements into one.
Signed-off-by Alexander Duyck <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
CC Ben Hutchings <[email protected]>
---
drivers/net/igb/igb_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/igb/igb_main.c +3 -3
@@ -2981,9 +2981,9 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb,if (tso) tx_flags |=IGB_TX_FLAGS_TSO ; -else if (igb_tx_csum_adv (adapter, tx_ring, skb, tx_flags)) -if (skb->ip_summed ==CHECKSUM_PARTIAL ) - tx_flags |=IGB_TX_FLAGS_CSUM ; +else if (igb_tx_csum_adv (adapter, tx_ring, skb, tx_flags) && + (skb->ip_summed ==CHECKSUM_PARTIAL )) + tx_flags |=IGB_TX_FLAGS_CSUM ; igb_tx_queue_adv(adapter, tx_ring, tx_flags, igb_tx_map_adv(adapter, tx_ring, skb, first),
From: Jeff Kirsher <[email protected]>
Date: Fri, 13 Feb 2009 16:45:17 -0800
Quoted 4 lines
This patch combines a pair of if statements into one.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.