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

Commit 44770e11 authored by Jarod Wilson's avatar Jarod Wilson Committed by David S. Miller
Browse files

ethernet: use core min/max MTU checking 



et131x: min_mtu 64, max_mtu 9216

altera_tse: min_mtu 64, max_mtu 1500

amd8111e: min_mtu 60, max_mtu 9000

bnad: min_mtu 46, max_mtu 9000

macb: min_mtu 68, max_mtu 1500 or 10240 depending on hardware capability

xgmac: min_mtu 46, max_mtu 9000

cxgb2: min_mtu 68, max_mtu 9582 (pm3393) or 9600 (vsc7326)

enic: min_mtu 68, max_mtu 9000

gianfar: min_mtu 50, max_mu 9586

hns_enet: min_mtu 68, max_mtu 9578 (v1) or 9706 (v2)

ksz884x: min_mtu 60, max_mtu 1894

myri10ge: min_mtu 68, max_mtu 9000

natsemi: min_mtu 64, max_mtu 2024

nfp: min_mtu 68, max_mtu hardware-specific

forcedeth: min_mtu 64, max_mtu 1500 or 9100, depending on hardware

pch_gbe: min_mtu 46, max_mtu 10300

pasemi_mac: min_mtu 64, max_mtu 9000

qcaspi: min_mtu 46, max_mtu 1500
- remove qcaspi_netdev_change_mtu as it is now redundant

rocker: min_mtu 68, max_mtu 9000

sxgbe: min_mtu 68, max_mtu 9000

stmmac: min_mtu 46, max_mtu depends on hardware

tehuti: min_mtu 60, max_mtu 16384
- driver had no max mtu checking, but product docs say 16k jumbo packets
  are supported by the hardware

netcp: min_mtu 68, max_mtu 9486
- remove netcp_ndo_change_mtu as it is now redundant

via-velocity: min_mtu 64, max_mtu 9000

octeon: min_mtu 46, max_mtu 65370

CC: netdev@vger.kernel.org
CC: Mark Einon <mark.einon@gmail.com>
CC: Vince Bridgers <vbridger@opensource.altera.com>
CC: Rasesh Mody <rasesh.mody@qlogic.com>
CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Santosh Raspatur <santosh@chelsio.com>
CC: Hariprasad S <hariprasad@chelsio.com>
CC:  Christian Benvenuti <benve@cisco.com>
CC: Sujith Sankar <ssujith@cisco.com>
CC: Govindarajulu Varadarajan <_govind@gmx.com>
CC: Neel Patel <neepatel@cisco.com>
CC: Claudiu Manoil <claudiu.manoil@freescale.com>
CC: Yisen Zhuang <yisen.zhuang@huawei.com>
CC: Salil Mehta <salil.mehta@huawei.com>
CC: Hyong-Youb Kim <hykim@myri.com>
CC: Jakub Kicinski <jakub.kicinski@netronome.com>
CC: Olof Johansson <olof@lixom.net>
CC: Jiri Pirko <jiri@resnulli.us>
CC: Byungho An <bh74.an@samsung.com>
CC: Girish K S <ks.giri@samsung.com>
CC: Vipul Pandya <vipul.pandya@samsung.com>
CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
CC: Alexandre Torgue <alexandre.torgue@st.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: Wingman Kwok <w-kwok2@ti.com>
CC: Murali Karicheri <m-karicheri2@ti.com>
CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1281a2c7

drivers/net/ethernet/agere/et131x.c

+4 −3
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ MODULE_DESCRIPTION("10/100/1000 Base-T Ethernet Driver for the ET1310 by Agere S 
#define NUM_FBRS		2



#define MAX_PACKETS_HANDLED	256

#define ET131X_MIN_MTU		64

#define ET131X_MAX_MTU		9216



#define ALCATEL_MULTICAST_PKT	0x01000000

#define ALCATEL_BROADCAST_PKT	0x02000000
@@ -3869,9 +3871,6 @@ static int et131x_change_mtu(struct net_device *netdev, int new_mtu) 
	int result = 0;

	struct et131x_adapter *adapter = netdev_priv(netdev);



	if (new_mtu < 64 || new_mtu > 9216)

		return -EINVAL;



	et131x_disable_txrx(netdev);



	netdev->mtu = new_mtu;
@@ -3958,6 +3957,8 @@ static int et131x_pci_setup(struct pci_dev *pdev, 


	netdev->watchdog_timeo = ET131X_TX_TIMEOUT;

	netdev->netdev_ops     = &et131x_netdev_ops;

	netdev->min_mtu        = ET131X_MIN_MTU;

	netdev->max_mtu        = ET131X_MAX_MTU;



	SET_NETDEV_DEV(netdev, &pdev->dev);

	netdev->ethtool_ops = &et131x_ethtool_ops;

drivers/net/ethernet/altera/altera_tse.h

+0 −1
Original line number Diff line number Diff line
@@ -443,7 +443,6 @@ struct altera_tse_private { 
	/* RX/TX MAC FIFO configs */

	u32 tx_fifo_depth;

	u32 rx_fifo_depth;

	u32 max_mtu;



	/* Hash filter settings */

	u32 hash_filter;

drivers/net/ethernet/altera/altera_tse_main.c

+3 −11
Original line number Diff line number Diff line
@@ -994,20 +994,11 @@ static void tse_set_mac(struct altera_tse_private *priv, bool enable) 
 */

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

{

	struct altera_tse_private *priv = netdev_priv(dev);

	unsigned int max_mtu = priv->max_mtu;

	unsigned int min_mtu = ETH_ZLEN + ETH_FCS_LEN;



	if (netif_running(dev)) {

		netdev_err(dev, "must be stopped to change its MTU\n");

		return -EBUSY;

	}



	if ((new_mtu < min_mtu) || (new_mtu > max_mtu)) {

		netdev_err(dev, "invalid MTU, max MTU is: %u\n", max_mtu);

		return -EINVAL;

	}



	dev->mtu = new_mtu;

	netdev_update_features(dev);
@@ -1446,15 +1437,16 @@ static int altera_tse_probe(struct platform_device *pdev) 
		of_property_read_bool(pdev->dev.of_node,

				      "altr,has-supplementary-unicast");



	priv->dev->min_mtu = ETH_ZLEN + ETH_FCS_LEN;

	/* Max MTU is 1500, ETH_DATA_LEN */

	priv->max_mtu = ETH_DATA_LEN;

	priv->dev->max_mtu = ETH_DATA_LEN;



	/* Get the max mtu from the device tree. Note that the

	 * "max-frame-size" parameter is actually max mtu. Definition

	 * in the ePAPR v1.1 spec and usage differ, so go with usage.

	 */

	of_property_read_u32(pdev->dev.of_node, "max-frame-size",

			     &priv->max_mtu);

			     &priv->dev->max_mtu);



	/* The DMA buffer size already accounts for an alignment bias

	 * to avoid unaligned access exceptions for the NIOS processor,

drivers/net/ethernet/amd/amd8111e.c

+2 −3
Original line number Diff line number Diff line
@@ -1556,9 +1556,6 @@ static int amd8111e_change_mtu(struct net_device *dev, int new_mtu) 
	struct amd8111e_priv *lp = netdev_priv(dev);

	int err;



	if ((new_mtu < AMD8111E_MIN_MTU) || (new_mtu > AMD8111E_MAX_MTU))

		return -EINVAL;



	if (!netif_running(dev)) {

		/* new_mtu will be used

		 * when device starts netxt time
@@ -1874,6 +1871,8 @@ static int amd8111e_probe_one(struct pci_dev *pdev, 
	dev->ethtool_ops = &ops;

	dev->irq =pdev->irq;

	dev->watchdog_timeo = AMD8111E_TX_TIMEOUT;

	dev->min_mtu = AMD8111E_MIN_MTU;

	dev->max_mtu = AMD8111E_MAX_MTU;

	netif_napi_add(dev, &lp->napi, amd8111e_rx_poll, 32);



#if AMD8111E_VLAN_TAG_USED

drivers/net/ethernet/brocade/bna/bnad.c

+4 −3
Original line number Diff line number Diff line
@@ -3296,9 +3296,6 @@ bnad_change_mtu(struct net_device *netdev, int new_mtu) 
	struct bnad *bnad = netdev_priv(netdev);

	u32 rx_count = 0, frame, new_frame;



	if (new_mtu + ETH_HLEN < ETH_ZLEN || new_mtu > BNAD_JUMBO_MTU)

		return -EINVAL;



	mutex_lock(&bnad->conf_mutex);



	mtu = netdev->mtu;
@@ -3465,6 +3462,10 @@ bnad_netdev_init(struct bnad *bnad, bool using_dac) 
	netdev->mem_start = bnad->mmio_start;

	netdev->mem_end = bnad->mmio_start + bnad->mmio_len - 1;



	/* MTU range: 46 - 9000 */

	netdev->min_mtu = ETH_ZLEN - ETH_HLEN;

	netdev->max_mtu = BNAD_JUMBO_MTU;



	netdev->netdev_ops = &bnad_netdev_ops;

	bnad_set_ethtool_ops(netdev);

}