|
@@ -623,6 +623,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
|
|
|
tunnel->err_count = 0;
|
|
|
}
|
|
|
|
|
|
+ tos = ip_tunnel_ecn_encap(tos, inner_iph, skb);
|
|
|
ttl = tnl_params->ttl;
|
|
|
if (ttl == 0) {
|
|
|
if (skb->protocol == htons(ETH_P_IP))
|
|
@@ -651,8 +652,7 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
|
|
|
}
|
|
|
|
|
|
err = iptunnel_xmit(rt, skb, fl4.saddr, fl4.daddr, protocol,
|
|
|
- ip_tunnel_ecn_encap(tos, inner_iph, skb), ttl, df,
|
|
|
- !net_eq(tunnel->net, dev_net(dev)));
|
|
|
+ tos, ttl, df, !net_eq(tunnel->net, dev_net(dev)));
|
|
|
iptunnel_xmit_stats(err, &dev->stats, dev->tstats);
|
|
|
|
|
|
return;
|