diff options
| author |   Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2013-05-27 23:48:15 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-05-31 17:19:05 -0700 |
| commit | bf3d6a8f791b2a81279b9ce3201b4970f6fbe51a (patch) | |
| tree | 72093c081b2de664ca77da0bc56fcaebf19eb195 /net/ipv4/ipip.c | |
| parent | net: clean up skb headers code (diff) | |
| download | linux-dev-bf3d6a8f791b2a81279b9ce3201b4970f6fbe51a.tar.xz linux-dev-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 'net/ipv4/ipip.c')
| -rw-r--r-- | net/ipv4/ipip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c index 77bfcce64fe5..9df7ecd393f2 100644 --- a/net/ipv4/ipip.c +++ b/net/ipv4/ipip.c @@ -222,7 +222,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev) skb->encapsulation = 1; } - ip_tunnel_xmit(skb, dev, tiph); + ip_tunnel_xmit(skb, dev, tiph, tiph->protocol); return NETDEV_TX_OK; tx_error: |