From 5ab267e2cb25c347f507dd4f5a6d37391cda21d2 Mon Sep 17 00:00:00 2001
From: Pravin B Shelar <pshelar@nicira.com>
Date: Sun, 24 Mar 2013 17:36:29 +0000
Subject: [PATCH] --- yaml --- r: 361851 b: refs/heads/master c:
 330305cc4a6b0cb75c22fc01b8826f0ad755550f h: refs/heads/master i:   361849:
 6707c76a91282938662b3a6d79caeb4789884634   361847:
 6149277bcc2d1b7751d777c52fd8a7fdfe162737 v: v3

---
 [refs]                   |  2 +-
 trunk/include/net/ipip.h | 16 ++++++----------
 trunk/net/ipv4/af_inet.c |  3 +--
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 90edd032e078..6e53f547bb75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fe16b78ee17579cb4f333534cf7043e94c67024
+refs/heads/master: 330305cc4a6b0cb75c22fc01b8826f0ad755550f
diff --git a/trunk/include/net/ipip.h b/trunk/include/net/ipip.h
index fd19625ff99d..982141c15200 100644
--- a/trunk/include/net/ipip.h
+++ b/trunk/include/net/ipip.h
@@ -77,15 +77,11 @@ static inline void tunnel_ip_select_ident(struct sk_buff *skb,
 {
 	struct iphdr *iph = ip_hdr(skb);
 
-	if (iph->frag_off & htons(IP_DF))
-		iph->id	= 0;
-	else {
-		/* Use inner packet iph-id if possible. */
-		if (skb->protocol == htons(ETH_P_IP) && old_iph->id)
-			iph->id	= old_iph->id;
-		else
-			__ip_select_ident(iph, dst,
-					  (skb_shinfo(skb)->gso_segs ?: 1) - 1);
-	}
+	/* Use inner packet iph-id if possible. */
+	if (skb->protocol == htons(ETH_P_IP) && old_iph->id)
+		iph->id	= old_iph->id;
+	else
+		__ip_select_ident(iph, dst,
+				  (skb_shinfo(skb)->gso_segs ?: 1) - 1);
 }
 #endif
diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c
index 68f6a94f7661..c929d9c1c4b6 100644
--- a/trunk/net/ipv4/af_inet.c
+++ b/trunk/net/ipv4/af_inet.c
@@ -1333,8 +1333,7 @@ static struct sk_buff *inet_gso_segment(struct sk_buff *skb,
 				iph->frag_off |= htons(IP_MF);
 			offset += (skb->len - skb->mac_len - iph->ihl * 4);
 		} else  {
-			if (!(iph->frag_off & htons(IP_DF)))
-				iph->id = htons(id++);
+			iph->id = htons(id++);
 		}
 		iph->tot_len = htons(skb->len - skb->mac_len);
 		iph->check = 0;