tree e158488e36eb37a7731ce9d19ff3e61b4c4ae064
parent aaa0c23cb90141309f5076ba5e3bfbd39544b985
author Timo Teräs <timo.teras@iki.fi> 1363142269 +0000
committer David S. Miller <davem@davemloft.net> 1363489241 -0400

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

This reverts commit 412ed94744d16806fbec3bd250fd94e71cde5a1f.

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: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>