* [net-next PATCH 4/6 v2] igb: misc cleanup to combine one if statement
@ 2009-02-14 0:45 Jeff Kirsher
2009-02-16 8:06 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2009-02-14 0:45 UTC (permalink / raw)
To: davem; +Cc: netdev, jeff, gospo, Alexander Duyck, Jeff Kirsher, Ben Hutchings
From: Alexander Duyck <alexander.h.duyck@intel.com>
This patch combines a pair of if statements into one.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
---
drivers/net/igb/igb_main.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 5a6bcef..6c6866b 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -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),
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [net-next PATCH 4/6 v2] igb: misc cleanup to combine one if statement
2009-02-14 0:45 [net-next PATCH 4/6 v2] igb: misc cleanup to combine one if statement Jeff Kirsher
@ 2009-02-16 8:06 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-02-16 8:06 UTC (permalink / raw)
To: jeffrey.t.kirsher; +Cc: netdev, jeff, gospo, alexander.h.duyck, bhutchings
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 13 Feb 2009 16:45:17 -0800
> This patch combines a pair of if statements into one.
>
> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-02-16 8:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-14 0:45 [net-next PATCH 4/6 v2] igb: misc cleanup to combine one if statement Jeff Kirsher
2009-02-16 8:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).