14 files changed, 15 insertions, 15 deletions

diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/atl1c/atl1c_main.c
index 09b099bfab2..e48ea956c51 100644
--- a/drivers/net/atl1c/atl1c_main.c
+++ b/drivers/net/atl1c/atl1c_main.c
@@ -2078,7 +2078,7 @@ static int atl1c_tso_csum(struct atl1c_adapter *adapter,
 check_sum:
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 u8 css, cso;
-                cso = skb_transport_offset(skb);
+                cso = skb_checksum_start_offset(skb);
 
                 if (unlikely(cso & 0x1)) {
                         if (netif_msg_tx_err(adapter))
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index ef6349bf3b3..e28f8baf394 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -1649,7 +1649,7 @@ check_sum:
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
                 u8 css, cso;
 
-                cso = skb_transport_offset(skb);
+                cso = skb_checksum_start_offset(skb);
                 if (unlikely(cso & 0x1)) {
                         netdev_err(adapter->netdev,
                                    "payload offset should not ant event number\n");
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index a8a32bc9aae..73502fef876 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -2788,7 +2788,7 @@ static inline int cas_xmit_tx_ringN(struct cas *cp, int ring,
 
         ctrl = 0;
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                const u64 csum_start_off = skb_transport_offset(skb);
+                const u64 csum_start_off = skb_checksum_start_offset(skb);
                 const u64 csum_stuff_off = csum_start_off + skb->csum_offset;
 
                 ctrl =  TX_DESC_CSUM_EN |
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 491bf2a1bab..340e12d2e4a 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -2726,7 +2726,7 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter,
                 break;
         }
 
-        css = skb_transport_offset(skb);
+        css = skb_checksum_start_offset(skb);
 
         i = tx_ring->next_to_use;
         buffer_info = &tx_ring->buffer_info[i];
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 02d093d1dd5..a45dafdf343 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4473,7 +4473,7 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
                 break;
         }
 
-        css = skb_transport_offset(skb);
+        css = skb_checksum_start_offset(skb);
 
         i = tx_ring->next_to_use;
         buffer_info = &tx_ring->buffer_info[i];
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 77d91381a74..9710047c12a 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -702,7 +702,7 @@ static inline void enic_queue_wq_skb_csum_l4(struct enic *enic,
 {
         unsigned int head_len = skb_headlen(skb);
         unsigned int len_left = skb->len - head_len;
-        unsigned int hdr_len = skb_transport_offset(skb);
+        unsigned int hdr_len = skb_checksum_start_offset(skb);
         unsigned int csum_offset = hdr_len + skb->csum_offset;
         int eop = (len_left == 0);
 
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index b021798ef49..5639cccb493 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1262,7 +1262,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_transport_offset(skb);
+                css = skb_checksum_start_offset(skb);
                 cso = css + skb->csum_offset;
 
                 i = adapter->tx_ring.next_to_use;
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index 9f8e7027b0b..e2c2a7202db 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -692,7 +692,7 @@ static int temac_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 
         cur_p->app0 = 0;
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                unsigned int csum_start_off = skb_transport_offset(skb);
+                unsigned int csum_start_off = skb_checksum_start_offset(skb);
                 unsigned int csum_index_off = csum_start_off + skb->csum_offset;
 
                 cur_p->app0 |= 1; /* TX Checksum Enabled */
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 1ce0207e62a..a37fcf11ab3 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2736,7 +2736,7 @@ again:
         odd_flag = 0;
         flags = (MXGEFW_FLAGS_NO_TSO | MXGEFW_FLAGS_FIRST);
         if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
-                cksum_offset = skb_transport_offset(skb);
+                cksum_offset = skb_checksum_start_offset(skb);
                 pseudo_hdr_offset = cksum_offset + skb->csum_offset;
                 /* If the headers are excessively large, then we must
                  * fall back to a software checksum */
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index f64c42414bd..2541321bad8 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -6589,7 +6589,7 @@ static u64 niu_compute_tx_flags(struct sk_buff *skb, struct ethhdr *ehdr,
                              (ip_proto == IPPROTO_UDP ?
                               TXHDR_CSUM_UDP : TXHDR_CSUM_SCTP));
 
-                start = skb_transport_offset(skb) -
+                start = skb_checksum_start_offset(skb) -
                         (pad_bytes + sizeof(struct tx_pkt_hdr));
                 stuff = start + skb->csum_offset;
 
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 8c1404b5838..50815fb963f 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -2764,7 +2764,7 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb,
         td->dma_hi = map >> 32;
 
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                const int offset = skb_transport_offset(skb);
+                const int offset = skb_checksum_start_offset(skb);
 
                 /* This seems backwards, but it is what the sk98lin
                  * does.  Looks like hardware is wrong?
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 9e992ca4f54..1c5408f8393 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -1004,7 +1004,7 @@ static netdev_tx_t gem_start_xmit(struct sk_buff *skb,
 
         ctrl = 0;
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                const u64 csum_start_off = skb_transport_offset(skb);
+                const u64 csum_start_off = skb_checksum_start_offset(skb);
                 const u64 csum_stuff_off = csum_start_off + skb->csum_offset;
 
                 ctrl = (TXDCTRL_CENAB |
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 5e28c414421..55bbb9c15d9 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2266,7 +2266,7 @@ static netdev_tx_t happy_meal_start_xmit(struct sk_buff *skb,
 
         tx_flags = TXFLAG_OWN;
         if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                const u32 csum_start_off = skb_transport_offset(skb);
+                const u32 csum_start_off = skb_checksum_start_offset(skb);
                 const u32 csum_stuff_off = csum_start_off + skb->csum_offset;
 
                 tx_flags = (TXFLAG_OWN | TXFLAG_CSENABLE |
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 0169be7694a..23154cf601e 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -798,7 +798,7 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
 {
         struct Vmxnet3_TxDataDesc *tdd;
 
-        if (ctx->mss) {
+        if (ctx->mss) { /* TSO */
                 ctx->eth_ip_hdr_size = skb_transport_offset(skb);
                 ctx->l4_hdr_size = ((struct tcphdr *)
                                    skb_transport_header(skb))->doff * 4;
@@ -807,7 +807,7 @@ vmxnet3_parse_and_copy_hdr(struct sk_buff *skb, struct vmxnet3_tx_queue *tq,
                 unsigned int pull_size;
 
                 if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                        ctx->eth_ip_hdr_size = skb_transport_offset(skb);
+                        ctx->eth_ip_hdr_size = skb_checksum_start_offset(skb);
 
                         if (ctx->ipv4) {
                                 struct iphdr *iph = (struct iphdr *)