9 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 521c5b71023c..fd2cc13f7d97 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -2825,7 +2825,7 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring,
                 u64 csum_start_off, csum_stuff_off;
 
                 csum_start_off = (u64) (skb->h.raw - skb->data);
-                csum_stuff_off = (u64) ((skb->h.raw + skb->csum) - skb->data);
+                csum_stuff_off = csum_start_off + skb->csum_offset;
 
                 ctrl =  TX_DESC_CSUM_EN |
                         CAS_BASE(TX_DESC_CSUM_START, csum_start_off) |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 7a0828869ecf..32dde0adb683 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2826,7 +2826,7 @@ e1000_tx_csum(struct e1000_adapter *adapter, struct e1000_tx_ring *tx_ring,
                 context_desc = E1000_CONTEXT_DESC(*tx_ring, i);
 
                 context_desc->upper_setup.tcp_fields.tucss = css;
-                context_desc->upper_setup.tcp_fields.tucso = css + skb->csum;
+                context_desc->upper_setup.tcp_fields.tucso = css + skb->csum_offset;
                 context_desc->upper_setup.tcp_fields.tucse = 0;
                 context_desc->tcp_seg_setup.data = 0;
                 context_desc->cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index e09f575a3a38..7b127212e62b 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1249,7 +1249,7 @@ ixgb_tx_csum(struct ixgb_adapter *adapter, struct sk_buff *skb)
         if(likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 struct ixgb_buffer *buffer_info;
                 css = skb->h.raw - skb->data;
-                cso = (skb->h.raw + skb->csum) - skb->data;
+                cso = css + skb->csum_offset;
 
                 i = adapter->tx_ring.next_to_use;
                 context_desc = IXGB_CONTEXT_DESC(adapter->tx_ring, i);
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 806081b59733..36350e6db1c1 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1955,7 +1955,7 @@ again:
         flags = (MXGEFW_FLAGS_NO_TSO | MXGEFW_FLAGS_FIRST);
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 cksum_offset = (skb->h.raw - skb->data);
-                pseudo_hdr_offset = (skb->h.raw + skb->csum) - skb->data;
+                pseudo_hdr_offset = cksum_offset + skb->csum_offset;
                 /* If the headers are excessively large, then we must
                  * fall back to a software checksum */
                 if (unlikely(cksum_offset > 255 || pseudo_hdr_offset > 127)) {
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
index a5d41ebc9fb4..12cbfd190dd7 100644
--- a/drivers/net/sk98lin/skge.c
+++ b/drivers/net/sk98lin/skge.c
@@ -1562,7 +1562,7 @@ struct sk_buff	*pMessage)	/* pointer to send-message              */
 
         if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
                 u16 hdrlen = pMessage->h.raw - pMessage->data;
-                u16 offset = hdrlen + pMessage->csum;
+                u16 offset = hdrlen + pMessage->csum_offset;
 
                 if ((pMessage->h.ipiph->protocol == IPPROTO_UDP ) &&
                         (pAC->GIni.GIChipRev == 0) &&
@@ -1681,7 +1681,7 @@ struct sk_buff	*pMessage)	/* pointer to send-message              */
         */
         if (pMessage->ip_summed == CHECKSUM_PARTIAL) {
                 u16 hdrlen = pMessage->h.raw - pMessage->data;
-                u16 offset = hdrlen + pMessage->csum;
+                u16 offset = hdrlen + pMessage->csum_offset;
 
                 Control = BMU_STFWD;
 
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 27b537c8d5e3..5513907e8393 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2565,7 +2565,7 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 
                 td->csum_offs = 0;
                 td->csum_start = offset;
-                td->csum_write = offset + skb->csum;
+                td->csum_write = offset + skb->csum_offset;
         } else
                 control = BMU_CHECK;
 
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 0ef1848b9761..842abd9396c6 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1350,7 +1350,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
                 u32 tcpsum;
 
                 tcpsum = offset << 16;          /* sum start */
-                tcpsum |= offset + skb->csum;   /* sum write */
+                tcpsum |= offset + skb->csum_offset;    /* sum write */
 
                 ctrl = CALSUM | WR_SUM | INIT_SUM | LOCK_SUM;
                 if (skb->nh.iph->protocol == IPPROTO_UDP)
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 253e96e7ad20..334c6cfd6595 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1030,7 +1030,7 @@ static int gem_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 u64 csum_start_off, csum_stuff_off;
 
                 csum_start_off = (u64) (skb->h.raw - skb->data);
-                csum_stuff_off = (u64) ((skb->h.raw + skb->csum) - skb->data);
+                csum_stuff_off = csum_start_off + skb->csum_offset;
 
                 ctrl = (TXDCTRL_CENAB |
                         (csum_start_off << 15) |
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 9d7cd130c19d..ec432ea879fb 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2272,7 +2272,7 @@ static int happy_meal_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 u32 csum_start_off, csum_stuff_off;
 
                 csum_start_off = (u32) (skb->h.raw - skb->data);
-                csum_stuff_off = (u32) ((skb->h.raw + skb->csum) - skb->data);
+                csum_stuff_off = csum_start_off + skb->csum_offset;
 
                 tx_flags = (TXFLAG_OWN | TXFLAG_CSENABLE |
                             ((csum_start_off << 14) & TXFLAG_CSBUFBEGIN) |