diff options
Diffstat (limited to 'include/net/ipip.h')
| -rw-r--r-- | include/net/ipip.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h index fd19625ff99d..982141c15200 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h | |||
| @@ -77,15 +77,11 @@ static inline void tunnel_ip_select_ident(struct sk_buff *skb, | |||
| 77 | { | 77 | { |
| 78 | struct iphdr *iph = ip_hdr(skb); | 78 | struct iphdr *iph = ip_hdr(skb); |
| 79 | 79 | ||
| 80 | if (iph->frag_off & htons(IP_DF)) | 80 | /* Use inner packet iph-id if possible. */ |
| 81 | iph->id = 0; | 81 | if (skb->protocol == htons(ETH_P_IP) && old_iph->id) |
| 82 | else { | 82 | iph->id = old_iph->id; |
| 83 | /* Use inner packet iph-id if possible. */ | 83 | else |
| 84 | if (skb->protocol == htons(ETH_P_IP) && old_iph->id) | 84 | __ip_select_ident(iph, dst, |
| 85 | iph->id = old_iph->id; | 85 | (skb_shinfo(skb)->gso_segs ?: 1) - 1); |
| 86 | else | ||
| 87 | __ip_select_ident(iph, dst, | ||
| 88 | (skb_shinfo(skb)->gso_segs ?: 1) - 1); | ||
| 89 | } | ||
| 90 | } | 86 | } |
| 91 | #endif | 87 | #endif |