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

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

net: use core MTU range checking in wireless drivers 



- set max_mtu in wil6210 driver
- set max_mtu in atmel driver
- set min/max_mtu in cisco airo driver, remove airo_change_mtu
- set min/max_mtu in ipw2100/ipw2200 drivers, remove libipw_change_mtu
- set min/max_mtu in p80211netdev, remove wlan_change_mtu
- set min/max_mtu in net/mac80211/iface.c and remove ieee80211_change_mtu
- set min/max_mtu in wimax/i2400m and remove i2400m_change_mtu
- set min/max_mtu in intersil/hostap and remove prism2_change_mtu
- set min/max_mtu in intersil/orinoco
- set min/max_mtu in tty/n_gsm and remove gsm_change_mtu

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: Maya Erez <qca_merez@qca.qualcomm.com>
CC: Simon Kelley <simon@thekelleys.org.uk>
CC: Stanislav Yakovlev <stas.yakovlev@gmail.com>
CC: Johannes Berg <johannes@sipsolutions.net>
CC: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f77f0aee

drivers/net/wimax/i2400m/netdev.c

+2 −20
Original line number Diff line number Diff line
@@ -394,25 +394,6 @@ netdev_tx_t i2400m_hard_start_xmit(struct sk_buff *skb, 
}





static

int i2400m_change_mtu(struct net_device *net_dev, int new_mtu)

{

	int result;

	struct i2400m *i2400m = net_dev_to_i2400m(net_dev);

	struct device *dev = i2400m_dev(i2400m);



	if (new_mtu >= I2400M_MAX_MTU) {

		dev_err(dev, "Cannot change MTU to %d (max is %d)\n",

			new_mtu, I2400M_MAX_MTU);

		result = -EINVAL;

	} else {

		net_dev->mtu = new_mtu;

		result = 0;

	}

	return result;

}





static

void i2400m_tx_timeout(struct net_device *net_dev)

{
@@ -590,7 +571,6 @@ static const struct net_device_ops i2400m_netdev_ops = { 
	.ndo_stop = i2400m_stop,

	.ndo_start_xmit = i2400m_hard_start_xmit,

	.ndo_tx_timeout = i2400m_tx_timeout,

	.ndo_change_mtu = i2400m_change_mtu,

};



static void i2400m_get_drvinfo(struct net_device *net_dev,
@@ -621,6 +601,8 @@ void i2400m_netdev_setup(struct net_device *net_dev) 
	d_fnstart(3, NULL, "(net_dev %p)\n", net_dev);

	ether_setup(net_dev);

	net_dev->mtu = I2400M_MAX_MTU;

	net_dev->min_mtu = 0;

	net_dev->max_mtu = I2400M_MAX_MTU;

	net_dev->tx_queue_len = I2400M_TX_QLEN;

	net_dev->features =

		  NETIF_F_VLAN_CHALLENGED

drivers/net/wireless/ath/wil6210/netdev.c

+1 −16
Original line number Diff line number Diff line
@@ -41,21 +41,6 @@ static int wil_stop(struct net_device *ndev) 
	return wil_down(wil);

}



static int wil_change_mtu(struct net_device *ndev, int new_mtu)

{

	struct wil6210_priv *wil = ndev_to_wil(ndev);



	if (new_mtu < 68 || new_mtu > mtu_max) {

		wil_err(wil, "invalid MTU %d\n", new_mtu);

		return -EINVAL;

	}



	wil_dbg_misc(wil, "change MTU %d -> %d\n", ndev->mtu, new_mtu);

	ndev->mtu = new_mtu;



	return 0;

}



static int wil_do_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)

{

	struct wil6210_priv *wil = ndev_to_wil(ndev);
@@ -69,7 +54,6 @@ static const struct net_device_ops wil_netdev_ops = { 
	.ndo_start_xmit		= wil_start_xmit,

	.ndo_set_mac_address	= eth_mac_addr,

	.ndo_validate_addr	= eth_validate_addr,

	.ndo_change_mtu		= wil_change_mtu,

	.ndo_do_ioctl		= wil_do_ioctl,

};
@@ -126,6 +110,7 @@ static int wil6210_netdev_poll_tx(struct napi_struct *napi, int budget) 
static void wil_dev_setup(struct net_device *dev)

{

	ether_setup(dev);

	dev->max_mtu = mtu_max;

	dev->tx_queue_len = WIL_TX_Q_LEN_DEFAULT;

}

drivers/net/wireless/atmel/atmel.c

+4 −9
Original line number Diff line number Diff line
@@ -1295,14 +1295,6 @@ static struct iw_statistics *atmel_get_wireless_stats(struct net_device *dev) 
	return &priv->wstats;

}



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

{

	if ((new_mtu < 68) || (new_mtu > 2312))

		return -EINVAL;

	dev->mtu = new_mtu;

	return 0;

}



static int atmel_set_mac_address(struct net_device *dev, void *p)

{

	struct sockaddr *addr = p;
@@ -1506,7 +1498,6 @@ static const struct file_operations atmel_proc_fops = { 
static const struct net_device_ops atmel_netdev_ops = {

	.ndo_open 		= atmel_open,

	.ndo_stop		= atmel_close,

	.ndo_change_mtu 	= atmel_change_mtu,

	.ndo_set_mac_address 	= atmel_set_mac_address,

	.ndo_start_xmit 	= start_tx,

	.ndo_do_ioctl 		= atmel_ioctl,
@@ -1600,6 +1591,10 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port, 
	dev->irq = irq;

	dev->base_addr = port;



	/* MTU range: 68 - 2312 */

	dev->min_mtu = 68;

	dev->max_mtu = MAX_WIRELESS_BODY - ETH_FCS_LEN;



	SET_NETDEV_DEV(dev, sys_dev);



	if ((rc = request_irq(dev->irq, service_interrupt, IRQF_SHARED, dev->name, dev))) {

drivers/net/wireless/cisco/airo.c

+3 −11
Original line number Diff line number Diff line
@@ -2329,14 +2329,6 @@ static int airo_set_mac_address(struct net_device *dev, void *p) 
	return 0;

}



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

{

	if ((new_mtu < 68) || (new_mtu > 2400))

		return -EINVAL;

	dev->mtu = new_mtu;

	return 0;

}



static LIST_HEAD(airo_devices);



static void add_airo_dev(struct airo_info *ai)
@@ -2656,7 +2648,6 @@ static const struct net_device_ops airo11_netdev_ops = { 
	.ndo_get_stats 		= airo_get_stats,

	.ndo_set_mac_address	= airo_set_mac_address,

	.ndo_do_ioctl		= airo_ioctl,

	.ndo_change_mtu		= airo_change_mtu,

};



static void wifi_setup(struct net_device *dev)
@@ -2668,6 +2659,8 @@ static void wifi_setup(struct net_device *dev) 
	dev->type               = ARPHRD_IEEE80211;

	dev->hard_header_len    = ETH_HLEN;

	dev->mtu                = AIRO_DEF_MTU;

	dev->min_mtu            = 68;

	dev->max_mtu            = MIC_MSGLEN_MAX;

	dev->addr_len           = ETH_ALEN;

	dev->tx_queue_len       = 100;
@@ -2754,7 +2747,6 @@ static const struct net_device_ops airo_netdev_ops = { 
	.ndo_set_rx_mode	= airo_set_multicast_list,

	.ndo_set_mac_address	= airo_set_mac_address,

	.ndo_do_ioctl		= airo_ioctl,

	.ndo_change_mtu		= airo_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

};
@@ -2766,7 +2758,6 @@ static const struct net_device_ops mpi_netdev_ops = { 
	.ndo_set_rx_mode	= airo_set_multicast_list,

	.ndo_set_mac_address	= airo_set_mac_address,

	.ndo_do_ioctl		= airo_ioctl,

	.ndo_change_mtu		= airo_change_mtu,

	.ndo_validate_addr	= eth_validate_addr,

};
@@ -2822,6 +2813,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port, 
	dev->irq = irq;

	dev->base_addr = port;

	dev->priv_flags &= ~IFF_TX_SKB_SHARING;

	dev->max_mtu = MIC_MSGLEN_MAX;



	SET_NETDEV_DEV(dev, dmdev);

drivers/net/wireless/intel/ipw2x00/ipw2100.c

+2 −1
Original line number Diff line number Diff line
@@ -6035,7 +6035,6 @@ static const struct net_device_ops ipw2100_netdev_ops = { 
	.ndo_open		= ipw2100_open,

	.ndo_stop		= ipw2100_close,

	.ndo_start_xmit		= libipw_xmit,

	.ndo_change_mtu		= libipw_change_mtu,

	.ndo_tx_timeout		= ipw2100_tx_timeout,

	.ndo_set_mac_address	= ipw2100_set_address,

	.ndo_validate_addr	= eth_validate_addr,
@@ -6071,6 +6070,8 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev, 
	dev->wireless_data = &priv->wireless_data;

	dev->watchdog_timeo = 3 * HZ;

	dev->irq = 0;

	dev->min_mtu = 68;

	dev->max_mtu = LIBIPW_DATA_LEN;



	/* NOTE: We don't use the wireless_handlers hook

	 * in dev as the system will start throwing WX requests