Merge c7f0fbe8f0d8f723000441c4afc2270c88fd011e on remote branch

Change-Id: I32db99d7d2cfd40b3d3e2f4dd997285006a0ded9

1 files changed, 14 insertions, 8 deletions

diff --git a/drivers/rmnet/shs/rmnet_shs_main.c b/drivers/rmnet/shs/rmnet_shs_main.c
index 8d9ed2b..c65298b 100755
--- a/drivers/rmnet/shs/rmnet_shs_main.c
+++ b/drivers/rmnet/shs/rmnet_shs_main.c
@@ -421,21 +421,27 @@ static struct sk_buff *rmnet_shs_skb_partial_segment(struct sk_buff *skb,
 		return NULL;
 	}
 
+	/* No need to set gso info if single segments */
+	if (segments_per_skb <= 1)
+		return segments;
+
 	/* Mark correct number of segments, size, and type in the new skbs */
 	for (tmp = segments; tmp; tmp = tmp->next) {
 		struct skb_shared_info *new_shinfo = skb_shinfo(tmp);
 
-		if (tmp->len > gso_size) {
-			new_shinfo->gso_type = gso_type;
-			new_shinfo->gso_size = gso_size;
+		new_shinfo->gso_type = gso_type;
+		new_shinfo->gso_size = gso_size;
 
-			if (gso_segs >= segments_per_skb)
-				new_shinfo->gso_segs = segments_per_skb;
-			else
-				new_shinfo->gso_segs = gso_segs;
-		}
+		if (gso_segs >= segments_per_skb)
+			new_shinfo->gso_segs = segments_per_skb;
+		else
+			new_shinfo->gso_segs = gso_segs;
 
 		gso_segs -= segments_per_skb;
+
+		if (gso_segs <= 1) {
+			break;
+		}
 	}
 
 	return segments;