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

Commit 9a27ded2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-4.14c-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fix from Juergen Gross:
 "A fix for the Xen pv network drivers (frontend and backend) avoiding
  the network connection to become unusable due to an illegal MTU"

* tag 'for-linus-4.14c-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-netfront, xen-netback: Use correct minimum MTU values
parents c925e0ea e1043a4b

drivers/net/xen-netback/interface.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ struct xenvif *xenvif_alloc(struct device *parent, domid_t domid, 


	dev->tx_queue_len = XENVIF_QUEUE_LENGTH;



	dev->min_mtu = 0;

	dev->min_mtu = ETH_MIN_MTU;

	dev->max_mtu = ETH_MAX_MTU - VLAN_ETH_HLEN;



	/*

drivers/net/xen-netfront.c

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev) 
	netdev->features |= netdev->hw_features;



	netdev->ethtool_ops = &xennet_ethtool_ops;

	netdev->min_mtu = 0;

	netdev->min_mtu = ETH_MIN_MTU;

	netdev->max_mtu = XEN_NETIF_MAX_TX_SIZE;

	SET_NETDEV_DEV(netdev, &dev->dev);