]> git.openpandora.org Git - pandora-kernel.git/commitdiff
ip_tunnel: push generic protocol handling to ip_tunnel module.
authorPravin B Shelar <pshelar@nicira.com>
Tue, 18 Jun 2013 00:50:02 +0000 (17:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 20 Jun 2013 01:07:41 +0000 (18:07 -0700)
Process skb tunnel header before sending packet to protocol handler.
this allows code sharing between gre and ovs gre modules.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip_tunnels.h
net/ipv4/gre.c
net/ipv4/ip_tunnel.c
net/ipv4/ip_tunnel_core.c
net/ipv4/ipip.c
net/ipv6/sit.c

Simple merge
diff --cc net/ipv4/gre.c
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/ipip.c
Simple merge
diff --cc net/ipv6/sit.c
Simple merge