diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-02-13 09:45:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-16 02:56:02 -0500 |
| commit | bc1cbd3493c7a6b44fa6a1e6040ae3d9640d47c4 (patch) | |
| tree | 40a036ffaf16e5a50901f2568ae163cbfed8b2eb /drivers/net/igb/igb_main.c | |
| parent | 56fbbb4e619f4bf604c350e3948a291bda759101 (diff) | |
igb: misc cleanup to combine one if statement
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
| -rw-r--r-- | 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 c259013fe7b2..18bc5700faf5 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -3133,9 +3133,9 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb, | |||
| 3133 | 3133 | ||
| 3134 | if (tso) | 3134 | if (tso) |
| 3135 | tx_flags |= IGB_TX_FLAGS_TSO; | 3135 | tx_flags |= IGB_TX_FLAGS_TSO; |
| 3136 | else if (igb_tx_csum_adv(adapter, tx_ring, skb, tx_flags)) | 3136 | else if (igb_tx_csum_adv(adapter, tx_ring, skb, tx_flags) && |
| 3137 | if (skb->ip_summed == CHECKSUM_PARTIAL) | 3137 | (skb->ip_summed == CHECKSUM_PARTIAL)) |
| 3138 | tx_flags |= IGB_TX_FLAGS_CSUM; | 3138 | tx_flags |= IGB_TX_FLAGS_CSUM; |
| 3139 | 3139 | ||
| 3140 | igb_tx_queue_adv(adapter, tx_ring, tx_flags, | 3140 | igb_tx_queue_adv(adapter, tx_ring, tx_flags, |
| 3141 | igb_tx_map_adv(adapter, tx_ring, skb, first), | 3141 | igb_tx_map_adv(adapter, tx_ring, skb, first), |