diff options
| author | Cong Wang <xiyou.wangcong@gmail.com> | 2013-03-09 16:38:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-10 03:05:44 -0400 |
| commit | 6aed0c8bf7d2f389b472834053eb6e3bd6926999 (patch) | |
| tree | 0b180bcbbefd6e6e447b8771d50fe5371b75bd29 /include/net/ipip.h | |
| parent | 4f3ed9209f7f75ff0ee21bc5052d76542dd75b5f (diff) | |
tunnel: use iptunnel_xmit() again
With recent patches from Pravin, most tunnels can't use iptunnel_xmit()
any more, due to ip_select_ident() and skb->ip_summed. But we can just
move these operations out of iptunnel_xmit(), so that tunnels can
use it again.
This by the way fixes a bug in vxlan (missing nf_reset()) for net-next.
Cc: Pravin B Shelar <pshelar@nicira.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ipip.h')
| -rw-r--r-- | include/net/ipip.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h index fd19625ff99..0c046e3bca0 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h @@ -51,13 +51,10 @@ struct ip_tunnel_prl_entry { static inline void iptunnel_xmit(struct sk_buff *skb, struct net_device *dev) { int err; - struct iphdr *iph = ip_hdr(skb); int pkt_len = skb->len - skb_transport_offset(skb); struct pcpu_tstats *tstats = this_cpu_ptr(dev->tstats); nf_reset(skb); - skb->ip_summed = CHECKSUM_NONE; - ip_select_ident(iph, skb_dst(skb), NULL); err = ip_local_out(skb); if (likely(net_xmit_eval(err) == 0)) { |