diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:45 +0100 |
| commit | dafe3258c5449e2697097285c37c761915053eae (patch) | |
| tree | 3132efe10ff5766feae3311993cd7eef7e75d6f3 /net/ipv4/ip_tunnel.c | |
| parent | 15812f79511f4b94ee42f35c9095ba0c0cb5204c (diff) | |
| parent | 4ed4d44eb2192604716226a6f0edad02ab76101f (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-13.09
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index cbfc37f5f05a..b7a4c21c06ec 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -686,7 +686,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, iph->daddr = fl4.daddr; iph->saddr = fl4.saddr; iph->ttl = ttl; - tunnel_ip_select_ident(skb, inner_iph, &rt->dst); + __ip_select_ident(iph, &rt->dst, (skb_shinfo(skb)->gso_segs ?: 1) - 1); iptunnel_xmit(skb, dev); return; |