Commit 9e58c5dc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'MTU-core-range-checking-more' 

Jarod Wilson says:

====================
net: use core MTU range checking everywhere

This stack of patches should get absolutely everything in the kernel
converted from doing their own MTU range checking to the core MTU range
checking. This second spin includes alterations to hopefully fix all
concerns raised with the first, as well as including some additional
changes to drivers and infrastructure where I completely missed necessary
updates.

These have all been built through the 0-day build infrastructure via the
(rebasing) master branch at https://github.com/jarodwilson/linux-muck

, which
at the time of the most recent compile across 147 configs, was based on
net-next at commit 7b1536ef.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1a61a8f1 b96f9afe

arch/um/drivers/net_kern.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -256,13 +256,6 @@ static void uml_net_tx_timeout(struct net_device *dev) 
	netif_wake_queue(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

#ifdef CONFIG_NET_POLL_CONTROLLER

static void uml_net_poll_controller(struct net_device *dev)

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_set_rx_mode	= uml_net_set_multicast_list,

	.ndo_tx_timeout 	= uml_net_tx_timeout,

	.ndo_tx_timeout 	= uml_net_tx_timeout,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_change_mtu 	= uml_net_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_validate_addr	= eth_validate_addr,

#ifdef CONFIG_NET_POLL_CONTROLLER

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller = uml_net_poll_controller,

	.ndo_poll_controller = uml_net_poll_controller,

drivers/char/pcmcia/synclink_cs.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -4248,7 +4248,6 @@ static void hdlcdev_rx(MGSLPC_INFO *info, char *buf, int size) 
static const struct net_device_ops hdlcdev_ops = {

static const struct net_device_ops hdlcdev_ops = {

	.ndo_open       = hdlcdev_open,

	.ndo_open       = hdlcdev_open,

	.ndo_stop       = hdlcdev_close,

	.ndo_stop       = hdlcdev_close,

	.ndo_change_mtu = hdlc_change_mtu,

	.ndo_start_xmit = hdlc_start_xmit,

	.ndo_start_xmit = hdlc_start_xmit,

	.ndo_do_ioctl   = hdlcdev_ioctl,

	.ndo_do_ioctl   = hdlcdev_ioctl,

	.ndo_tx_timeout = hdlcdev_tx_timeout,

	.ndo_tx_timeout = hdlcdev_tx_timeout,

drivers/firewire/net.c

+4 −14
Original line number Original line 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;

	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 = {

static const struct ethtool_ops fwnet_ethtool_ops = {

	.get_link	= ethtool_op_get_link,

	.get_link	= ethtool_op_get_link,

};

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

	.ndo_open       = fwnet_open,

	.ndo_stop	= fwnet_stop,

	.ndo_stop	= fwnet_stop,

	.ndo_start_xmit = fwnet_tx,

	.ndo_start_xmit = fwnet_tx,

	.ndo_change_mtu = fwnet_change_mtu,

};

};





static void fwnet_init_dev(struct net_device *net)

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;

	struct net_device *net;

	bool allocated_netdev = false;

	bool allocated_netdev = false;

	struct fwnet_device *dev;

	struct fwnet_device *dev;

	unsigned max_mtu;

	int ret;

	int ret;

	union fwnet_hwaddr *ha;

	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

	 * Use the RFC 2734 default 1500 octets or the maximum payload

	 * as initial MTU

	 * 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;

		       - 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 */

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

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

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

drivers/hsi/clients/ssi_protocol.c

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

	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)

static void ssip_xmit_work(struct work_struct *work)

{

{

	struct ssi_protocol *ssi =

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

	.ndo_open	= ssip_pn_open,

	.ndo_stop	= ssip_pn_stop,

	.ndo_stop	= ssip_pn_stop,

	.ndo_start_xmit	= ssip_pn_xmit,

	.ndo_start_xmit	= ssip_pn_xmit,

	.ndo_change_mtu	= ssip_pn_set_mtu,

};

};





static void ssip_pn_setup(struct net_device *dev)

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

		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);

	SET_NETDEV_DEV(ssi->netdev, dev);

	netif_carrier_off(ssi->netdev);

	netif_carrier_off(ssi->netdev);

	err = register_netdev(ssi->netdev);

	err = register_netdev(ssi->netdev);

drivers/infiniband/hw/nes/nes.c

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

MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION(DRV_VERSION);

MODULE_VERSION(DRV_VERSION);





int max_mtu = 9000;

int interrupt_mod_interval = 0;

int interrupt_mod_interval = 0;





/* Interoperability */

/* Interoperability */

CRA Git | Maintained and supported by SUSTech CRA and CCSE