diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-03-13 02:37:49 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-16 23:00:41 -0400 |
| commit | 8c6216d7f118a128678270824b6a1286a63863ca (patch) | |
| tree | e158488e36eb37a7731ce9d19ff3e61b4c4ae064 /net/ipv4/ip_gre.c | |
| parent | aaa0c23cb90141309f5076ba5e3bfbd39544b985 (diff) | |
| download | op-kernel-dev-8c6216d7f118a128678270824b6a1286a63863ca.zip op-kernel-dev-8c6216d7f118a128678270824b6a1286a63863ca.tar.gz | |
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>
Diffstat (limited to 'net/ipv4/ip_gre.c')
| -rw-r--r-- | net/ipv4/ip_gre.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index d0ef0e6..91d66db 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -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) { gre_hlen = 0; - if (skb->protocol == htons(ETH_P_IP)) - tiph = (const struct iphdr *)skb->data; - else - tiph = &tunnel->parms.iph; + tiph = (const struct iphdr *)skb->data; } else { gre_hlen = tunnel->hlen; tiph = &tunnel->parms.iph; |
