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

Commit 5568cdc3 authored by David S. Miller's avatar David S. Miller
Browse files

ip_tunnel: Resolve ipsec merge conflict properly. 



We want to use dev_set_mtu() regardless of how we calculate
the mtu value.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d2d99ec

net/ipv4/ip_tunnel.c

+6 −6
Original line number Diff line number Diff line
@@ -1120,13 +1120,13 @@ int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[], 
	if (tb[IFLA_MTU]) {

		unsigned int max = 0xfff8 - dev->hard_header_len - nt->hlen;



		dev->mtu = clamp(dev->mtu, (unsigned int)ETH_MIN_MTU,

		mtu = clamp(dev->mtu, (unsigned int)ETH_MIN_MTU,

			    (unsigned int)(max - sizeof(struct iphdr)));

	} else {

	}



	err = dev_set_mtu(dev, mtu);

	if (err)

		goto err_dev_set_mtu;

	}



	ip_tunnel_add(itn, nt);

	return 0;