Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e2e20b authored by Xin Long's avatar Xin Long Committed by Greg Kroah-Hartman
Browse files

sit: fix IFLA_MTU ignored on NEWLINK 



[ Upstream commit 2b3957c34b6d7f03544b12ebbf875eee430745db ]

Commit 128bb975dc3c ("ip6_gre: init dev->mtu and dev->hard_header_len
correctly") fixed IFLA_MTU ignored on NEWLINK for ip6_gre. The same
mtu fix is also needed for sit.

Note that dev->hard_header_len setting for sit works fine, no need to
fix it. sit is actually ipv4 tunnel, it can't call ip6_tnl_change_mtu
to set mtu.

Reported-by: default avatarJianlin Shi <jishi@redhat.com>
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b0fbc2f

net/ipv6/sit.c

+7 −0
Original line number Diff line number Diff line
@@ -1569,6 +1569,13 @@ static int ipip6_newlink(struct net *src_net, struct net_device *dev, 
	if (err < 0)

		return err;



	if (tb[IFLA_MTU]) {

		u32 mtu = nla_get_u32(tb[IFLA_MTU]);



		if (mtu >= IPV6_MIN_MTU && mtu <= 0xFFF8 - dev->hard_header_len)

			dev->mtu = mtu;

	}



#ifdef CONFIG_IPV6_SIT_6RD

	if (ipip6_netlink_6rd_parms(data, &ip6rd))

		err = ipip6_tunnel_update_6rd(nt, &ip6rd);