Merge mulgrave-w:git/linux-2.6

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 1c01e9b3d07c..826548644d7b 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -2040,7 +2040,7 @@ static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
                  */
                 if (bd_flags & BD_FLG_TCP_UDP_SUM) {
                         skb->csum = htons(csum);
-                        skb->ip_summed = CHECKSUM_HW;
+                        skb->ip_summed = CHECKSUM_COMPLETE;
                 } else {
                         skb->ip_summed = CHECKSUM_NONE;
                 }
@@ -2511,7 +2511,7 @@ restart:
 
                 mapping = ace_map_tx_skb(ap, skb, skb, idx);
                 flagsize = (skb->len << 16) | (BD_FLG_END);
-                if (skb->ip_summed == CHECKSUM_HW)
+                if (skb->ip_summed == CHECKSUM_PARTIAL)
                         flagsize |= BD_FLG_TCP_UDP_SUM;
 #if ACENIC_DO_VLAN
                 if (vlan_tx_tag_present(skb)) {
@@ -2534,7 +2534,7 @@ restart:
 
                 mapping = ace_map_tx_skb(ap, skb, NULL, idx);
                 flagsize = (skb_headlen(skb) << 16);
-                if (skb->ip_summed == CHECKSUM_HW)
+                if (skb->ip_summed == CHECKSUM_PARTIAL)
                         flagsize |= BD_FLG_TCP_UDP_SUM;
 #if ACENIC_DO_VLAN
                 if (vlan_tx_tag_present(skb)) {
@@ -2560,7 +2560,7 @@ restart:
                                                PCI_DMA_TODEVICE);
 
                         flagsize = (frag->size << 16);
-                        if (skb->ip_summed == CHECKSUM_HW)
+                        if (skb->ip_summed == CHECKSUM_PARTIAL)
                                 flagsize |= BD_FLG_TCP_UDP_SUM;
                         idx = (idx + 1) % ACE_TX_RING_ENTRIES(ap);