tunnel: use iptunnel_xmit() again
authorCong Wang <xiyou.wangcong@gmail.com>
Sat, 9 Mar 2013 16:38:39 +0000 (16:38 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 10 Mar 2013 07:05:44 +0000 (03:05 -0400)
commit6aed0c8bf7d2f389b472834053eb6e3bd6926999
tree0b180bcbbefd6e6e447b8771d50fe5371b75bd29
parent4f3ed9209f7f75ff0ee21bc5052d76542dd75b5f
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>
drivers/net/vxlan.c
include/net/ipip.h
net/ipv4/ip_gre.c
net/ipv4/ipip.c
net/ipv6/sit.c