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

Commit 91c527a5 authored by Jarod Wilson's avatar Jarod Wilson Committed by David S. Miller
Browse files

ethernet/intel: use core min/max MTU checking 



e100: min_mtu 68, max_mtu 1500
- remove e100_change_mtu entirely, is identical to old eth_change_mtu,
  and no longer serves a purpose. No need to set min_mtu or max_mtu
  explicitly, as ether_setup() will already set them to 68 and 1500.

e1000: min_mtu 46, max_mtu 16110

e1000e: min_mtu 68, max_mtu varies based on adapter

fm10k: min_mtu 68, max_mtu 15342
- remove fm10k_change_mtu entirely, does nothing now

i40e: min_mtu 68, max_mtu 9706

i40evf: min_mtu 68, max_mtu 9706

igb: min_mtu 68, max_mtu 9216
- There are two different "max" frame sizes claimed and both checked in
  the driver, the larger value wasn't relevant though, so I've set max_mtu
  to the smaller of the two values here to retain identical behavior.

igbvf: min_mtu 68, max_mtu 9216
- Same issue as igb duplicated

ixgb: min_mtu 68, max_mtu 16114
- Also remove pointless old == new check, as that's done in dev_set_mtu

ixgbe: min_mtu 68, max_mtu 9710

ixgbevf: min_mtu 68, max_mtu dependent on hardware/firmware
- Some hw can only handle up to max_mtu 1504 on a vf, others 9710

CC: netdev@vger.kernel.org
CC: intel-wired-lan@lists.osuosl.org
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1c6dcca

drivers/net/ethernet/intel/e100.c

+0 −9
Original line number Diff line number Diff line
@@ -2286,14 +2286,6 @@ static int e100_set_mac_address(struct net_device *netdev, void *p) 
	return 0;

}



static int e100_change_mtu(struct net_device *netdev, int new_mtu)

{

	if (new_mtu < ETH_ZLEN || new_mtu > ETH_DATA_LEN)

		return -EINVAL;

	netdev->mtu = new_mtu;

	return 0;

}



static int e100_asf(struct nic *nic)

{

	/* ASF can be enabled from eeprom */
@@ -2834,7 +2826,6 @@ static const struct net_device_ops e100_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

	.ndo_set_rx_mode	= e100_set_multicast_list,

	.ndo_set_mac_address	= e100_set_mac_address,

	.ndo_change_mtu		= e100_change_mtu,

	.ndo_do_ioctl		= e100_do_ioctl,

	.ndo_tx_timeout		= e100_tx_timeout,

#ifdef CONFIG_NET_POLL_CONTROLLER

drivers/net/ethernet/intel/e1000/e1000_main.c

+5 −7
Original line number Diff line number Diff line
@@ -1085,6 +1085,10 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	    hw->subsystem_vendor_id != PCI_VENDOR_ID_VMWARE)

		netdev->priv_flags |= IFF_UNICAST_FLT;



	/* MTU range: 46 - 16110 */

	netdev->min_mtu = ETH_ZLEN - ETH_HLEN;

	netdev->max_mtu = MAX_JUMBO_FRAME_SIZE - (ETH_HLEN + ETH_FCS_LEN);



	adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw);



	/* initialize eeprom parameters */
@@ -3549,13 +3553,7 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) 
{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	int max_frame = new_mtu + ENET_HEADER_SIZE + ETHERNET_FCS_SIZE;



	if ((max_frame < MINIMUM_ETHERNET_FRAME_SIZE) ||

	    (max_frame > MAX_JUMBO_FRAME_SIZE)) {

		e_err(probe, "Invalid MTU setting\n");

		return -EINVAL;

	}

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;



	/* Adapter-specific max frame size limits. */

	switch (hw->mac_type) {

drivers/net/ethernet/intel/e1000e/netdev.c

+6 −8
Original line number Diff line number Diff line
@@ -5974,19 +5974,12 @@ static int e1000_change_mtu(struct net_device *netdev, int new_mtu) 
	int max_frame = new_mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;



	/* Jumbo frame support */

	if ((max_frame > (VLAN_ETH_FRAME_LEN + ETH_FCS_LEN)) &&

	if ((new_mtu > ETH_DATA_LEN) &&

	    !(adapter->flags & FLAG_HAS_JUMBO_FRAMES)) {

		e_err("Jumbo Frames not supported.\n");

		return -EINVAL;

	}



	/* Supported frame sizes */

	if ((new_mtu < (VLAN_ETH_ZLEN + ETH_FCS_LEN)) ||

	    (max_frame > adapter->max_hw_frame_size)) {

		e_err("Unsupported MTU setting\n");

		return -EINVAL;

	}



	/* Jumbo frame workaround on 82579 and newer requires CRC be stripped */

	if ((adapter->hw.mac.type >= e1000_pch2lan) &&

	    !(adapter->flags2 & FLAG2_CRC_STRIPPING) &&
@@ -7187,6 +7180,11 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		netdev->vlan_features |= NETIF_F_HIGHDMA;

	}



	/* MTU range: 68 - max_hw_frame_size */

	netdev->min_mtu = ETH_MIN_MTU;

	netdev->max_mtu = adapter->max_hw_frame_size -

			  (VLAN_ETH_HLEN + ETH_FCS_LEN);



	if (e1000e_enable_mng_pass_thru(&adapter->hw))

		adapter->flags |= FLAG_MNG_PT_ENABLED;

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+4 −11
Original line number Diff line number Diff line
@@ -706,16 +706,6 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev) 
	return err;

}



static int fm10k_change_mtu(struct net_device *dev, int new_mtu)

{

	if (new_mtu < 68 || new_mtu > FM10K_MAX_JUMBO_FRAME_SIZE)

		return -EINVAL;



	dev->mtu = new_mtu;



	return 0;

}



/**

 * fm10k_tx_timeout - Respond to a Tx Hang

 * @netdev: network interface device structure
@@ -1405,7 +1395,6 @@ static const struct net_device_ops fm10k_netdev_ops = { 
	.ndo_validate_addr	= eth_validate_addr,

	.ndo_start_xmit		= fm10k_xmit_frame,

	.ndo_set_mac_address	= fm10k_set_mac,

	.ndo_change_mtu		= fm10k_change_mtu,

	.ndo_tx_timeout		= fm10k_tx_timeout,

	.ndo_vlan_rx_add_vid	= fm10k_vlan_rx_add_vid,

	.ndo_vlan_rx_kill_vid	= fm10k_vlan_rx_kill_vid,
@@ -1490,5 +1479,9 @@ struct net_device *fm10k_alloc_netdev(const struct fm10k_info *info) 


	dev->hw_features |= hw_features;



	/* MTU range: 68 - 15342 */

	dev->min_mtu = ETH_MIN_MTU;

	dev->max_mtu = FM10K_MAX_JUMBO_FRAME_SIZE;



	return dev;

}

drivers/net/ethernet/intel/i40e/i40e_main.c

+5 −5
Original line number Diff line number Diff line
@@ -2239,13 +2239,8 @@ static void i40e_sync_filters_subtask(struct i40e_pf *pf) 
static int i40e_change_mtu(struct net_device *netdev, int new_mtu)

{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;

	struct i40e_vsi *vsi = np->vsi;



	/* MTU < 68 is an error and causes problems on some kernels */

	if ((new_mtu < 68) || (max_frame > I40E_MAX_RXBUFFER))

		return -EINVAL;



	netdev_info(netdev, "changing MTU from %d to %d\n",

		    netdev->mtu, new_mtu);

	netdev->mtu = new_mtu;
@@ -9220,6 +9215,11 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
	i40e_fcoe_config_netdev(netdev, vsi);

#endif



	/* MTU range: 68 - 9706 */

	netdev->min_mtu = ETH_MIN_MTU;

	netdev->max_mtu = I40E_MAX_RXBUFFER -

			  (ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN);



	return 0;

}