From 4f2a22fb768c523b1c1dcca468bc39c2c7cf5816 Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Fri, 8 Mar 2013 15:12:45 +0000 Subject: [PATCH] --- yaml --- r: 368171 b: refs/heads/master c: 8344bfc6008d1c7b8b541bb25de7dfacb2188b95 h: refs/heads/master i: 368169: d0674999d76ab548d9751cc08c72d8a5d43c696e 368167: 4fb197646b7575359a19fe127e729e2c609bf9ef v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipip.c | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 77d2f5ebd605..75c01c23b589 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 720a43efd30f04a0a492c85fb997361c44fbae05 +refs/heads/master: 8344bfc6008d1c7b8b541bb25de7dfacb2188b95 diff --git a/trunk/net/ipv4/ipip.c b/trunk/net/ipv4/ipip.c index 8f024d41eefa..18f535299ef9 100644 --- a/trunk/net/ipv4/ipip.c +++ b/trunk/net/ipv4/ipip.c @@ -478,6 +478,8 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) __be32 dst = tiph->daddr; struct flowi4 fl4; int mtu; + int err; + int pkt_len; if (skb->protocol != htons(ETH_P_IP)) goto tx_error; @@ -591,11 +593,28 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) iph->tos = INET_ECN_encapsulate(tos, old_iph->tos); iph->daddr = fl4.daddr; iph->saddr = fl4.saddr; + tunnel_ip_select_ident(skb, old_iph, &rt->dst); if ((iph->ttl = tiph->ttl) == 0) iph->ttl = old_iph->ttl; - iptunnel_xmit(skb, dev); + nf_reset(skb); + skb->ip_summed = CHECKSUM_NONE; + + pkt_len = skb->len - skb_transport_offset(skb); + err = ip_local_out(skb); + if (likely(net_xmit_eval(err) == 0)) { + struct pcpu_tstats *tstats = this_cpu_ptr(dev->tstats); + + u64_stats_update_begin(&tstats->syncp); + tstats->tx_bytes += pkt_len; + tstats->tx_packets++; + u64_stats_update_end(&tstats->syncp); + } else { + dev->stats.tx_errors++; + dev->stats.tx_aborted_errors++; + } + return NETDEV_TX_OK; tx_error_icmp: