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

net: use core MTU range checking in misc drivers 



firewire-net:
- set min/max_mtu
- remove fwnet_change_mtu

nes:
- set max_mtu
- clean up nes_netdev_change_mtu

xpnet:
- set min/max_mtu
- remove xpnet_dev_change_mtu

hippi:
- set min/max_mtu
- remove hippi_change_mtu

batman-adv:
- set max_mtu
- remove batadv_interface_change_mtu
- initialization is a little async, not 100% certain that max_mtu is set
  in the optimal place, don't have hardware to test with

rionet:
- set min/max_mtu
- remove rionet_change_mtu

slip:
- set min/max_mtu
- streamline sl_change_mtu

um/net_kern:
- remove pointless ndo_change_mtu

hsi/clients/ssi_protocol:
- use core MTU range checking
- remove now redundant ssip_pn_set_mtu

ipoib:
- set a default max MTU value
- Note: ipoib's actual max MTU can vary, depending on if the device is in
  connected mode or not, so we'll just set the max_mtu value to the max
  possible, and let the ndo_change_mtu function continue to validate any new
  MTU change requests with checks for CM or not. Note that ipoib has no
  min_mtu set, and thus, the network core's mtu > 0 check is the only lower
  bounds here.

mptlan:
- use net core MTU range checking
- remove now redundant mpt_lan_change_mtu

fddi:
- min_mtu = 21, max_mtu = 4470
- remove now redundant fddi_change_mtu (including export)

fjes:
- min_mtu = 8192, max_mtu = 65536
- The max_mtu value is actually one over IP_MAX_MTU here, but the idea is to
  get past the core net MTU range checks so fjes_change_mtu can validate a
  new MTU against what it supports (see fjes_support_mtu in fjes_hw.c)

hsr:
- min_mtu = 0 (calls ether_setup, max_mtu is 1500)

f_phonet:
- min_mtu = 6, max_mtu = 65541

u_ether:
- min_mtu = 14, max_mtu = 15412

phonet/pep-gprs:
- min_mtu = 576, max_mtu = 65530
- remove redundant gprs_set_mtu

CC: netdev@vger.kernel.org
CC: linux-rdma@vger.kernel.org
CC: Stefan Richter <stefanr@s5r6.in-berlin.de>
CC: Faisal Latif <faisal.latif@intel.com>
CC: linux-rdma@vger.kernel.org
CC: Cliff Whickman <cpw@sgi.com>
CC: Robin Holt <robinmholt@gmail.com>
CC: Jes Sorensen <jes@trained-monkey.org>
CC: Marek Lindner <mareklindner@neomailbox.ch>
CC: Simon Wunderlich <sw@simonwunderlich.de>
CC: Antonio Quartulli <a@unstable.cc>
CC: Sathya Prakash <sathya.prakash@broadcom.com>
CC: Chaitra P B <chaitra.basappa@broadcom.com>
CC: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
CC: MPT-FusionLinux.pdl@broadcom.com
CC: Sebastian Reichel <sre@kernel.org>
CC: Felipe Balbi <balbi@kernel.org>
CC: Arvid Brodin <arvid.brodin@alten.se>
CC: Remi Denis-Courmont <courmisch@gmail.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0c2c997

arch/um/drivers/net_kern.c

+0 −8
Original line number Diff line number Diff line
@@ -256,13 +256,6 @@ static void uml_net_tx_timeout(struct net_device *dev) 
	netif_wake_queue(dev);

}



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

{

	dev->mtu = new_mtu;



	return 0;

}



#ifdef CONFIG_NET_POLL_CONTROLLER

static void uml_net_poll_controller(struct net_device *dev)

{
@@ -374,7 +367,6 @@ static const struct net_device_ops uml_netdev_ops = { 
	.ndo_set_rx_mode	= uml_net_set_multicast_list,

	.ndo_tx_timeout 	= uml_net_tx_timeout,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_change_mtu 	= uml_net_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller = uml_net_poll_controller,

drivers/firewire/net.c

+4 −14
Original line number Diff line number Diff line
@@ -1349,15 +1349,6 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net) 
	return NETDEV_TX_OK;

}



static int fwnet_change_mtu(struct net_device *net, int new_mtu)

{

	if (new_mtu < 68)

		return -EINVAL;



	net->mtu = new_mtu;

	return 0;

}



static const struct ethtool_ops fwnet_ethtool_ops = {

	.get_link	= ethtool_op_get_link,

};
@@ -1366,7 +1357,6 @@ static const struct net_device_ops fwnet_netdev_ops = { 
	.ndo_open       = fwnet_open,

	.ndo_stop	= fwnet_stop,

	.ndo_start_xmit = fwnet_tx,

	.ndo_change_mtu = fwnet_change_mtu,

};



static void fwnet_init_dev(struct net_device *net)
@@ -1435,7 +1425,6 @@ static int fwnet_probe(struct fw_unit *unit, 
	struct net_device *net;

	bool allocated_netdev = false;

	struct fwnet_device *dev;

	unsigned max_mtu;

	int ret;

	union fwnet_hwaddr *ha;
@@ -1478,9 +1467,10 @@ static int fwnet_probe(struct fw_unit *unit, 
	 * Use the RFC 2734 default 1500 octets or the maximum payload

	 * as initial MTU

	 */

	max_mtu = (1 << (card->max_receive + 1))

	net->max_mtu = (1 << (card->max_receive + 1))

		       - sizeof(struct rfc2734_header) - IEEE1394_GASP_HDR_SIZE;

	net->mtu = min(1500U, max_mtu);

	net->mtu = min(1500U, net->max_mtu);

	net->min_mtu = ETH_MIN_MTU;



	/* Set our hardware address while we're at it */

	ha = (union fwnet_hwaddr *)net->dev_addr;

drivers/hsi/clients/ssi_protocol.c

+4 −10
Original line number Diff line number Diff line
@@ -960,15 +960,6 @@ static int ssip_pn_stop(struct net_device *dev) 
	return 0;

}



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

{

	if (new_mtu > SSIP_MAX_MTU || new_mtu < PHONET_MIN_MTU)

		return -EINVAL;

	dev->mtu = new_mtu;



	return 0;

}



static void ssip_xmit_work(struct work_struct *work)

{

	struct ssi_protocol *ssi =
@@ -1060,7 +1051,6 @@ static const struct net_device_ops ssip_pn_ops = { 
	.ndo_open	= ssip_pn_open,

	.ndo_stop	= ssip_pn_stop,

	.ndo_start_xmit	= ssip_pn_xmit,

	.ndo_change_mtu	= ssip_pn_set_mtu,

};



static void ssip_pn_setup(struct net_device *dev)
@@ -1136,6 +1126,10 @@ static int ssi_protocol_probe(struct device *dev) 
		goto out1;

	}



	/* MTU range: 6 - 65535 */

	ssi->netdev->min_mtu = PHONET_MIN_MTU;

	ssi->netdev->max_mtu = SSIP_MAX_MTU;



	SET_NETDEV_DEV(ssi->netdev, dev);

	netif_carrier_off(ssi->netdev);

	err = register_netdev(ssi->netdev);

drivers/infiniband/hw/nes/nes.c

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ MODULE_DESCRIPTION("NetEffect RNIC Low-level iWARP Driver"); 
MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION(DRV_VERSION);



int max_mtu = 9000;

int interrupt_mod_interval = 0;



/* Interoperability */

drivers/infiniband/hw/nes/nes.h

+2 −2
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ 
#define NES_FIRST_QPN           64

#define NES_SW_CONTEXT_ALIGN    1024



#define NES_MAX_MTU		9000



#define NES_NIC_MAX_NICS        16

#define NES_MAX_ARP_TABLE_SIZE  4096
@@ -169,8 +171,6 @@ do { \ 
#include "nes_cm.h"

#include "nes_mgt.h"



extern int max_mtu;

#define max_frame_len (max_mtu+ETH_HLEN)

extern int interrupt_mod_interval;

extern int nes_if_count;

extern int mpa_version;

CRA Git | Maintained and supported by SUSTech CRA and CCSE