linux-next: manual merge of the ipsec tree with the net tree

[Stephen Rothwell]

Hi Steffen,

Today's linux-next merge of the ipsec tree got a conflict in:

  net/ipv4/ip_tunnel.c

between commit:

  f6cc9c054e77 ("ip_tunnel: Emit events for post-register MTU changes")

from the net tree and commit:

  24fc79798b8d ("ip_tunnel: Clamp MTU to bounds on new link")

from the ipsec tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/ipv4/ip_tunnel.c
index 7b85ffad5d74,7c76dd17b6b9..000000000000
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@@ -1117,10 -1108,13 +1117,15 @@@ int ip_tunnel_newlink(struct net_devic
  		eth_hw_addr_random(dev);
  
  	mtu = ip_tunnel_bind_dev(dev);
- 	if (!tb[IFLA_MTU]) {
+ 	if (tb[IFLA_MTU]) {
+ 		unsigned int max = 0xfff8 - dev->hard_header_len - nt->hlen;
+ 
+ 		dev->mtu = clamp(dev->mtu, (unsigned int)ETH_MIN_MTU,
+ 				 (unsigned int)(max - sizeof(struct iphdr)));
+ 	} else {
 -		dev->mtu = mtu;
 +		err = dev_set_mtu(dev, mtu);
 +		if (err)
 +			goto err_dev_set_mtu;
  	}
  
  	ip_tunnel_add(itn, nt);

Attachment: pgpGeBYOPaIIo.pgp
Description: OpenPGP digital signature