From d48b8fc22a90dc072790965707a3386fa06e0f70 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Fri, 13 Feb 2009 14:45:17 +0000 Subject: [PATCH] --- yaml --- r: 134576 b: refs/heads/master c: bc1cbd3493c7a6b44fa6a1e6040ae3d9640d47c4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 82dbdaf38c2f..29fa0f15139e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56fbbb4e619f4bf604c350e3948a291bda759101 +refs/heads/master: bc1cbd3493c7a6b44fa6a1e6040ae3d9640d47c4 diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index c259013fe7b2..18bc5700faf5 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -3133,9 +3133,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),