From: Timo Teräs Date: Wed, 13 Mar 2013 02:37:49 +0000 (+0000) Subject: Revert "ip_gre: make ipgre_tunnel_xmit() not parse network header as IP unconditionally" X-Git-Tag: v3.9-rc4~27^2~15 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6216d7f118a128678270824b6a1286a63863ca;p=pandora-kernel.git 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 Signed-off-by: David S. Miller --- Reading git-diff-tree failed