]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 35d0461) | patch
iptunnel: specify protocol outside IP header
authorNicolas Dichtel <nicolas.dichtel@6wind.com>
Mon, 27 May 2013 23:48:15 +0000 (23:48 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 1 Jun 2013 00:19:05 +0000 (17:19 -0700)
commitbf3d6a8f791b2a81279b9ce3201b4970f6fbe51a
tree72093c081b2de664ca77da0bc56fcaebf19eb195tree | snapshot
parent35d0461061f27eeb62de63174959edbbb9e434decommit | diff
iptunnel: specify protocol outside IP header

Before this patch, ip_tunnel_xmit() was using the field protocol from the IP
header passed into argument.
There is no functional change, this patch prepares the support of IPv4 over
IPv4 for module sit.

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip_tunnels.h diff | blob | blame | history
net/ipv4/ip_gre.c diff | blob | blame | history
net/ipv4/ip_tunnel.c diff | blob | blame | history
net/ipv4/ipip.c diff | blob | blame | history
Michael's Linux tree.