diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-05-28 03:48:15 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-01 04:19:05 +0400 |
| commit | bf3d6a8f791b2a81279b9ce3201b4970f6fbe51a (patch) | |
| tree | 72093c081b2de664ca77da0bc56fcaebf19eb195 /net/ipv4/ip_gre.c | |
| parent | 35d0461061f27eeb62de63174959edbbb9e434de (diff) | |
| download | linux-bf3d6a8f791b2a81279b9ce3201b4970f6fbe51a.tar.xz | |
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>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 2a83591492dd..a982657d05e7 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -429,7 +429,7 @@ static void __gre_xmit(struct sk_buff *skb, struct net_device *dev, return; } - ip_tunnel_xmit(skb, dev, tnl_params); + ip_tunnel_xmit(skb, dev, tnl_params, tnl_params->protocol); } static netdev_tx_t ipgre_xmit(struct sk_buff *skb, |