1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index fbece63395a8..a831f947ca8c 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1181,7 +1181,9 @@ map_failed:
 
 static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt)
 {
+        struct tcphdr *tcph;
         int offset = 0;
+        int hdr_len;
 
         /* only TCP packets will be aggregated */
         if (skb->protocol == htons(ETH_P_IP)) {
@@ -1208,14 +1210,20 @@ static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt)
         /* if mss is not set through Large Packet bit/mss in rx buffer,
          * expect that the mss will be written to the tcp header checksum.
          */
+        tcph = (struct tcphdr *)(skb->data + offset);
         if (lrg_pkt) {
                 skb_shinfo(skb)->gso_size = mss;
         } else if (offset) {
-                struct tcphdr *tcph = (struct tcphdr *)(skb->data + offset);
-
                 skb_shinfo(skb)->gso_size = ntohs(tcph->check);
                 tcph->check = 0;
         }
+
+        if (skb_shinfo(skb)->gso_size) {
+                hdr_len = offset + tcph->doff * 4;
+                skb_shinfo(skb)->gso_segs =
+                                DIV_ROUND_UP(skb->len - hdr_len,
+                                             skb_shinfo(skb)->gso_size);
+        }
 }
 
 static int ibmveth_poll(struct napi_struct *napi, int budget)