Commit 8c6216d7 authored by Timo Teräs's avatar Timo Teräs Committed by David S. Miller
Browse files

Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally"

This reverts commit 412ed947

.

The commit is wrong as tiph points to the outer IPv4 header which is
installed at ipgre_header() and not the inner one which is protocol dependant.

This commit broke succesfully opennhrp which use PF_PACKET socket with
ETH_P_NHRP protocol. Additionally ssl_addr is set to the link-layer
IPv4 address. This address is written by ipgre_header() to the skb
earlier, and this is the IPv4 header tiph should point to - regardless
of the inner protocol payload.
Signed-off-by: default avatarTimo Teräs <timo.teras@iki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aaa0c23c
...@@ -798,10 +798,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev ...@@ -798,10 +798,7 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
if (dev->header_ops && dev->type == ARPHRD_IPGRE) { if (dev->header_ops && dev->type == ARPHRD_IPGRE) {
gre_hlen = 0; gre_hlen = 0;
if (skb->protocol == htons(ETH_P_IP)) tiph = (const struct iphdr *)skb->data;
tiph = (const struct iphdr *)skb->data;
else
tiph = &tunnel->parms.iph;
} else { } else {
gre_hlen = tunnel->hlen; gre_hlen = tunnel->hlen;
tiph = &tunnel->parms.iph; tiph = &tunnel->parms.iph;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment