diff options
| author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2016-07-02 09:02:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-04 23:50:22 +0200 |
| commit | d5d5e8d55732c7c35c354e45e3b0af2795978a57 (patch) | |
| tree | 60310c1afeab8627c1f216680a230a4d658a5e5b /drivers/net/geneve.c | |
| parent | net: phy: dp83867: Fix initialization of PHYCR register (diff) | |
| download | linux-d5d5e8d55732c7c35c354e45e3b0af2795978a57.tar.xz linux-d5d5e8d55732c7c35c354e45e3b0af2795978a57.zip | |
geneve: fix max_mtu setting
For ipv6+udp+geneve encapsulation data, the max_mtu should subtract
sizeof(ipv6hdr), instead of sizeof(iphdr).
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/geneve.c')
| -rw-r--r-- | drivers/net/geneve.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index cc39cefeae45..9b3dc3c61e00 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1072,12 +1072,17 @@ static netdev_tx_t geneve_xmit(struct sk_buff *skb, struct net_device *dev) static int __geneve_change_mtu(struct net_device *dev, int new_mtu, bool strict) { + struct geneve_dev *geneve = netdev_priv(dev); /* The max_mtu calculation does not take account of GENEVE * options, to avoid excluding potentially valid * configurations. */ - int max_mtu = IP_MAX_MTU - GENEVE_BASE_HLEN - sizeof(struct iphdr) - - dev->hard_header_len; + int max_mtu = IP_MAX_MTU - GENEVE_BASE_HLEN - dev->hard_header_len; + + if (geneve->remote.sa.sa_family == AF_INET6) + max_mtu -= sizeof(struct ipv6hdr); + else + max_mtu -= sizeof(struct iphdr); if (new_mtu < 68) return -EINVAL; |