diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-15 13:43:21 +0100 |
| commit | 4ed4d44eb2192604716226a6f0edad02ab76101f (patch) | |
| tree | 74c2a4041e46b906d89c5880b9cdeb5d768827c4 /drivers/net/vxlan.c | |
| parent | cb03293a043ab9bda850fe143062bd304a9e2376 (diff) | |
| parent | 410dbb746130bc052bb3c7a337a86252874adbdf (diff) | |
Merge tag 'v3.10.12' into linux-linaro-lsklsk-13.09
This is the 3.10.12 stable release
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 57325f356d4..054489fdf54 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1090,7 +1090,7 @@ static netdev_tx_t vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, iph->daddr = dst; iph->saddr = fl4.saddr; iph->ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); - tunnel_ip_select_ident(skb, old_iph, &rt->dst); + __ip_select_ident(iph, &rt->dst, (skb_shinfo(skb)->gso_segs ?: 1) - 1); nf_reset(skb); |