diff options
author | 2013-03-20 12:46:26 -0400 | |
---|---|---|
committer | 2013-03-20 12:46:26 -0400 | |
commit | 61816596d1c9026d0ecb20c44f90452c41596ffe (patch) | |
tree | 3027ed6dc62f71e14b9d525405747fa0eb8f074d /net/ipv4/ip_gre.c | |
parent | net: fix psock_fanout selftest hash collision (diff) | |
parent | net: fec: Define indexes as 'unsigned int' (diff) | |
download | linux-61816596d1c9026d0ecb20c44f90452c41596ffe.tar.gz linux-61816596d1c9026d0ecb20c44f90452c41596ffe.tar.bz2 linux-61816596d1c9026d0ecb20c44f90452c41596ffe.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull in the 'net' tree to get Daniel Borkmann's flow dissector
infrastructure change.
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 a13a0972a57f..2e94289a17e8 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -796,10 +796,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; |