diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-05-28 01:48:15 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-01 02:19:05 +0200 |
| commit | bf3d6a8f791b2a81279b9ce3201b4970f6fbe51a (patch) | |
| tree | 72093c081b2de664ca77da0bc56fcaebf19eb195 /include/net/ip_tunnels.h | |
| parent | net: clean up skb headers code (diff) | |
| download | linux-bf3d6a8f791b2a81279b9ce3201b4970f6fbe51a.tar.xz linux-bf3d6a8f791b2a81279b9ce3201b4970f6fbe51a.zip | |
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 'include/net/ip_tunnels.h')
| -rw-r--r-- | include/net/ip_tunnels.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 4b6f0b28f41f..40b4dfce01fc 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h @@ -101,7 +101,7 @@ int __net_init ip_tunnel_init_net(struct net *net, int ip_tnl_net_id, void __net_exit ip_tunnel_delete_net(struct ip_tunnel_net *itn); void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, - const struct iphdr *tnl_params); + const struct iphdr *tnl_params, const u8 protocol); int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd); int ip_tunnel_change_mtu(struct net_device *dev, int new_mtu); |