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

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

ethernet/toshiba: use core min/max MTU checking 



gelic_net: min_mtu 64, max_mtu 1518
- remove gelic_net_change_mtu now that it is redundant

spidernet: min_Mtu 64, max_mtu 2294
- remove spiter_net_change_mtu now that it is redundant

CC: netdev@vger.kernel.org
CC: Geoff Levand <geoff@infradead.org>
CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f58f0817

drivers/net/ethernet/toshiba/ps3_gelic_net.c

+4 −19
Original line number Diff line number Diff line
@@ -1114,24 +1114,6 @@ static int gelic_net_poll(struct napi_struct *napi, int budget) 
	}

	return packets_done;

}

/**

 * gelic_net_change_mtu - changes the MTU of an interface

 * @netdev: interface device structure

 * @new_mtu: new MTU value

 *

 * returns 0 on success, <0 on failure

 */

int gelic_net_change_mtu(struct net_device *netdev, int new_mtu)

{

	/* no need to re-alloc skbs or so -- the max mtu is about 2.3k

	 * and mtu is outbound only anyway */

	if ((new_mtu < GELIC_NET_MIN_MTU) ||

	    (new_mtu > GELIC_NET_MAX_MTU)) {

		return -EINVAL;

	}

	netdev->mtu = new_mtu;

	return 0;

}



/**

 * gelic_card_interrupt - event handler for gelic_net
@@ -1446,7 +1428,6 @@ static const struct net_device_ops gelic_netdevice_ops = { 
	.ndo_stop = gelic_net_stop,

	.ndo_start_xmit = gelic_net_xmit,

	.ndo_set_rx_mode = gelic_net_set_multi,

	.ndo_change_mtu = gelic_net_change_mtu,

	.ndo_tx_timeout = gelic_net_tx_timeout,

	.ndo_set_mac_address = eth_mac_addr,

	.ndo_validate_addr = eth_validate_addr,
@@ -1513,6 +1494,10 @@ int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card) 
		netdev->features |= NETIF_F_VLAN_CHALLENGED;

	}



	/* MTU range: 64 - 1518 */

	netdev->min_mtu = GELIC_NET_MIN_MTU;

	netdev->max_mtu = GELIC_NET_MAX_MTU;



	status = register_netdev(netdev);

	if (status) {

		dev_err(ctodev(card), "%s:Couldn't register %s %d\n",

drivers/net/ethernet/toshiba/ps3_gelic_net.h

+0 −1
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ int gelic_net_stop(struct net_device *netdev); 
int gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev);

void gelic_net_set_multi(struct net_device *netdev);

void gelic_net_tx_timeout(struct net_device *netdev);

int gelic_net_change_mtu(struct net_device *netdev, int new_mtu);

int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card);



/* shared ethtool ops */

drivers/net/ethernet/toshiba/ps3_gelic_wireless.c

+0 −1
Original line number Diff line number Diff line
@@ -2558,7 +2558,6 @@ static const struct net_device_ops gelic_wl_netdevice_ops = { 
	.ndo_stop = gelic_wl_stop,

	.ndo_start_xmit = gelic_net_xmit,

	.ndo_set_rx_mode = gelic_net_set_multi,

	.ndo_change_mtu = gelic_net_change_mtu,

	.ndo_tx_timeout = gelic_net_tx_timeout,

	.ndo_set_mac_address = eth_mac_addr,

	.ndo_validate_addr = eth_validate_addr,

drivers/net/ethernet/toshiba/spider_net.c

+4 −20
Original line number Diff line number Diff line
@@ -1278,25 +1278,6 @@ static int spider_net_poll(struct napi_struct *napi, int budget) 
	return packets_done;

}



/**

 * spider_net_change_mtu - changes the MTU of an interface

 * @netdev: interface device structure

 * @new_mtu: new MTU value

 *

 * returns 0 on success, <0 on failure

 */

static int

spider_net_change_mtu(struct net_device *netdev, int new_mtu)

{

	/* no need to re-alloc skbs or so -- the max mtu is about 2.3k

	 * and mtu is outbound only anyway */

	if ( (new_mtu < SPIDER_NET_MIN_MTU ) ||

		(new_mtu > SPIDER_NET_MAX_MTU) )

		return -EINVAL;

	netdev->mtu = new_mtu;

	return 0;

}



/**

 * spider_net_set_mac - sets the MAC of an interface

 * @netdev: interface device structure
@@ -2229,7 +2210,6 @@ static const struct net_device_ops spider_net_ops = { 
	.ndo_start_xmit		= spider_net_xmit,

	.ndo_set_rx_mode	= spider_net_set_multi,

	.ndo_set_mac_address	= spider_net_set_mac,

	.ndo_change_mtu		= spider_net_change_mtu,

	.ndo_do_ioctl		= spider_net_do_ioctl,

	.ndo_tx_timeout		= spider_net_tx_timeout,

	.ndo_validate_addr	= eth_validate_addr,
@@ -2299,6 +2279,10 @@ spider_net_setup_netdev(struct spider_net_card *card) 
	/* some time: NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX |

	 *		NETIF_F_HW_VLAN_CTAG_FILTER */



	/* MTU range: 64 - 2294 */

	netdev->min_mtu = SPIDER_NET_MIN_MTU;

	netdev->max_mtu = SPIDER_NET_MAX_MTU;



	netdev->irq = card->pdev->irq;

	card->num_rx_ints = 0;

	card->ignore_rx_ramfull = 0;