diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2013-07-11 13:12:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-28 16:30:02 -0700 |
| commit | 6afbcb59964ec9dc3dd63ed96a9e2cda31f8a072 (patch) | |
| tree | 6aa13e211fe1cd87b341bab8069f1c69b7d92c81 /net/ipv4 | |
| parent | f84ddbc58cfd8551757efe3c61242c4d6e9918ce (diff) | |
| download | linux-3.10-6afbcb59964ec9dc3dd63ed96a9e2cda31f8a072.tar.gz linux-3.10-6afbcb59964ec9dc3dd63ed96a9e2cda31f8a072.tar.bz2 linux-3.10-6afbcb59964ec9dc3dd63ed96a9e2cda31f8a072.zip | |
gre: Fix MTU sizing check for gretap tunnels
[ Upstream commit 8c91e162e058bb91b7766f26f4d5823a21941026 ]
This change fixes an MTU sizing issue seen with gretap tunnels when non-gso
packets are sent from the interface.
In my case I was able to reproduce the issue by simply sending a ping of
1421 bytes with the gretap interface created on a device with a standard
1500 mtu.
This fix is based on the fact that the tunnel mtu is already adjusted by
dev->hard_header_len so it would make sense that any packets being compared
against that mtu should also be adjusted by hard_header_len and the tunnel
header instead of just the tunnel header.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Reported-by: Cong Wang <amwang@redhat.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index d05bd02886e..cbfc37f5f05 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -490,7 +490,7 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb, struct rtable *rt, __be16 df) { struct ip_tunnel *tunnel = netdev_priv(dev); - int pkt_size = skb->len - tunnel->hlen; + int pkt_size = skb->len - tunnel->hlen - dev->hard_header_len; int mtu; if (df) |