1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index e2d25fbb6d28..3f445efa9482 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -1618,7 +1618,7 @@ static void write_swqe2_TSO(struct sk_buff *skb,
 {
         struct ehea_vsgentry *sg1entry = &swqe->u.immdata_desc.sg_entry;
         u8 *imm_data = &swqe->u.immdata_desc.immediate_data[0];
-        int skb_data_size = skb->len - skb->data_len;
+        int skb_data_size = skb_headlen(skb);
         int headersize;
 
         /* Packet is TCP with TSO enabled */
@@ -1629,7 +1629,7 @@ static void write_swqe2_TSO(struct sk_buff *skb,
          */
         headersize = ETH_HLEN + ip_hdrlen(skb) + tcp_hdrlen(skb);
 
-        skb_data_size = skb->len - skb->data_len;
+        skb_data_size = skb_headlen(skb);
 
         if (skb_data_size >= headersize) {
                 /* copy immediate data */
@@ -1651,7 +1651,7 @@ static void write_swqe2_TSO(struct sk_buff *skb,
 static void write_swqe2_nonTSO(struct sk_buff *skb,
                                struct ehea_swqe *swqe, u32 lkey)
 {
-        int skb_data_size = skb->len - skb->data_len;
+        int skb_data_size = skb_headlen(skb);
         u8 *imm_data = &swqe->u.immdata_desc.immediate_data[0];
         struct ehea_vsgentry *sg1entry = &swqe->u.immdata_desc.sg_entry;
 
@@ -2108,8 +2108,8 @@ static void ehea_xmit3(struct sk_buff *skb, struct net_device *dev,
         } else {
                 /* first copy data from the skb->data buffer ... */
                 skb_copy_from_linear_data(skb, imm_data,
-                                          skb->len - skb->data_len);
-                imm_data += skb->len - skb->data_len;
+                                          skb_headlen(skb));
+                imm_data += skb_headlen(skb);
 
                 /* ... then copy data from the fragments */
                 for (i = 0; i < nfrags; i++) {