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

Commit 1441dc99 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethernet-use-core-min-max-mtu' 



Jarod Wilson says:

====================
ethernet: use core min/max MTU checking

Now that the network stack core min/max MTU checking infrastructure is in
place, time to start making drivers use it. We'll start with the easiest
ones, the ethernet drivers, split roughly by vendor, with a catch-all
patch at the end.

For the most part, every patch does the same essential thing: removes the
MTU range checking from the drivers' ndo_change_mtu function, puts those
ranges into the core net_device min_mtu and max_mtu fields, and where
possible, removes ndo_change_mtu functions entirely.

These patches have all been built through the 0-day build infrastructure
provided by Intel, on top of net-next as of October 17.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 60d2d8dd 44770e11

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/atheros/alx/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -351,7 +351,6 @@ struct alx_rrd { 
#define ALX_MAX_JUMBO_PKT_SIZE	(9*1024)

#define ALX_MAX_TSO_PKT_SIZE	(7*1024)

#define ALX_MAX_FRAME_SIZE	ALX_MAX_JUMBO_PKT_SIZE

#define ALX_MIN_FRAME_SIZE	(ETH_ZLEN + ETH_FCS_LEN + VLAN_HLEN)



#define ALX_MAX_RX_QUEUES	8

#define ALX_MAX_TX_QUEUES	4