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

net: use core MTU range checking in USB NIC drivers 



usbnet:
- Remove stale new_mtu <= 0 check in usbnet.c
- Set min_mtu = 0, max_mtu = 65535 (sub-drivers must set their own
  max_mtu and/or min_mtu as needed)

r8152:
- Set appropriate max_mtu for different variants (1500 or 9194)

lan78xx:
- Set max_mtu = 9000

asix_driver:
- max_mtu = 16384 for ax88178 variant

ax88179:
- max_mtu = 4088

cdc_ncm:
- max_mtu from hardware

cdc-phonet:
- min_mtu = 6, max_mtu = 65541

sierra_net:
- max_mtu = 1500, call usbnet_change_mtu directly
- sierra_net_change_mtu checked for MTU > 1500, then called
  usbnet_change_mtu, but if we set max_mtu to let the network core handle
  the range check, then we can simply call usbnet_change_mtu directly

smsc75xx:
- max_mtu = 9000

CC: netdev@vger.kernel.org
CC: Woojung Huh <woojung.huh@microchip.com>
CC: Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
CC: Hayes Wang <hayeswang@realtek.com>
CC: Oliver Neukum <oneukum@suse.com>
CC: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d894be57

drivers/net/usb/asix_devices.c

+1 −3
Original line number Diff line number Diff line
@@ -1026,9 +1026,6 @@ static int ax88178_change_mtu(struct net_device *net, int new_mtu) 


	netdev_dbg(dev->net, "ax88178_change_mtu() new_mtu=%d\n", new_mtu);



	if (new_mtu <= 0 || ll_mtu > 16384)

		return -EINVAL;



	if ((ll_mtu % dev->maxpacket) == 0)

		return -EDOM;
@@ -1081,6 +1078,7 @@ static int ax88178_bind(struct usbnet *dev, struct usb_interface *intf) 


	dev->net->netdev_ops = &ax88178_netdev_ops;

	dev->net->ethtool_ops = &ax88178_ethtool_ops;

	dev->net->max_mtu = 16384 - (dev->net->hard_header_len + 4);



	/* Blink LEDS so users know driver saw dongle */

	asix_sw_reset(dev, 0, 0);

drivers/net/usb/ax88179_178a.c

+1 −3
Original line number Diff line number Diff line
@@ -907,9 +907,6 @@ static int ax88179_change_mtu(struct net_device *net, int new_mtu) 
	struct usbnet *dev = netdev_priv(net);

	u16 tmp16;



	if (new_mtu <= 0 || new_mtu > 4088)

		return -EINVAL;



	net->mtu = new_mtu;

	dev->hard_mtu = net->mtu + net->hard_header_len;
@@ -1266,6 +1263,7 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf) 
	dev->net->netdev_ops = &ax88179_netdev_ops;

	dev->net->ethtool_ops = &ax88179_ethtool_ops;

	dev->net->needed_headroom = 8;

	dev->net->max_mtu = 4088;



	/* Initialize MII structure */

	dev->mii.dev = dev->net;

drivers/net/usb/cdc-phonet.c

+2 −10
Original line number Diff line number Diff line
@@ -276,21 +276,11 @@ static int usbpn_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	return -ENOIOCTLCMD;

}



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

{

	if ((new_mtu < PHONET_MIN_MTU) || (new_mtu > PHONET_MAX_MTU))

		return -EINVAL;



	dev->mtu = new_mtu;

	return 0;

}



static const struct net_device_ops usbpn_ops = {

	.ndo_open	= usbpn_open,

	.ndo_stop	= usbpn_close,

	.ndo_start_xmit = usbpn_xmit,

	.ndo_do_ioctl	= usbpn_ioctl,

	.ndo_change_mtu = usbpn_set_mtu,

};



static void usbpn_setup(struct net_device *dev)
@@ -301,6 +291,8 @@ static void usbpn_setup(struct net_device *dev) 
	dev->type		= ARPHRD_PHONET;

	dev->flags		= IFF_POINTOPOINT | IFF_NOARP;

	dev->mtu		= PHONET_MAX_MTU;

	dev->min_mtu		= PHONET_MIN_MTU;

	dev->max_mtu		= PHONET_MAX_MTU;

	dev->hard_header_len	= 1;

	dev->dev_addr[0]	= PN_MEDIA_USB;

	dev->addr_len		= 1;

drivers/net/usb/cdc_ncm.c

+1 −4
Original line number Diff line number Diff line
@@ -740,10 +740,6 @@ static void cdc_ncm_free(struct cdc_ncm_ctx *ctx) 
int cdc_ncm_change_mtu(struct net_device *net, int new_mtu)

{

	struct usbnet *dev = netdev_priv(net);

	int maxmtu = cdc_ncm_max_dgram_size(dev) - cdc_ncm_eth_hlen(dev);



	if (new_mtu <= 0 || new_mtu > maxmtu)

		return -EINVAL;



	net->mtu = new_mtu;

	cdc_ncm_set_dgram_size(dev, new_mtu + cdc_ncm_eth_hlen(dev));
@@ -909,6 +905,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ 


	/* must handle MTU changes */

	dev->net->netdev_ops = &cdc_ncm_netdev_ops;

	dev->net->max_mtu = cdc_ncm_max_dgram_size(dev) - cdc_ncm_eth_hlen(dev);



	return 0;

drivers/net/usb/lan78xx.c

+3 −5
Original line number Diff line number Diff line
@@ -1980,11 +1980,6 @@ static int lan78xx_change_mtu(struct net_device *netdev, int new_mtu) 
	int old_rx_urb_size = dev->rx_urb_size;

	int ret;



	if (new_mtu > MAX_SINGLE_PACKET_SIZE)

		return -EINVAL;



	if (new_mtu <= 0)

		return -EINVAL;

	/* no second zero-length packet read wanted after mtu-sized packets */

	if ((ll_mtu % dev->maxpacket) == 0)

		return -EDOM;
@@ -3388,6 +3383,9 @@ static int lan78xx_probe(struct usb_interface *intf, 
	if (netdev->mtu > (dev->hard_mtu - netdev->hard_header_len))

		netdev->mtu = dev->hard_mtu - netdev->hard_header_len;



	/* MTU range: 68 - 9000 */

	netdev->max_mtu = MAX_SINGLE_PACKET_SIZE;



	dev->ep_blkin = (intf->cur_altsetting)->endpoint + 0;

	dev->ep_blkout = (intf->cur_altsetting)->endpoint + 1;

	dev->ep_intr = (intf->cur_altsetting)->endpoint + 2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE