Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jarod Wilson <jarod@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Jarod Wilson and committed by
David S. Miller
1281a2c7 f58f0817

+8 -41
+4 -19
drivers/net/ethernet/toshiba/ps3_gelic_net.c
··· 1114 1114 } 1115 1115 return packets_done; 1116 1116 } 1117 - /** 1118 - * gelic_net_change_mtu - changes the MTU of an interface 1119 - * @netdev: interface device structure 1120 - * @new_mtu: new MTU value 1121 - * 1122 - * returns 0 on success, <0 on failure 1123 - */ 1124 - int gelic_net_change_mtu(struct net_device *netdev, int new_mtu) 1125 - { 1126 - /* no need to re-alloc skbs or so -- the max mtu is about 2.3k 1127 - * and mtu is outbound only anyway */ 1128 - if ((new_mtu < GELIC_NET_MIN_MTU) || 1129 - (new_mtu > GELIC_NET_MAX_MTU)) { 1130 - return -EINVAL; 1131 - } 1132 - netdev->mtu = new_mtu; 1133 - return 0; 1134 - } 1135 1117 1136 1118 /** 1137 1119 * gelic_card_interrupt - event handler for gelic_net ··· 1428 1446 .ndo_stop = gelic_net_stop, 1429 1447 .ndo_start_xmit = gelic_net_xmit, 1430 1448 .ndo_set_rx_mode = gelic_net_set_multi, 1431 - .ndo_change_mtu = gelic_net_change_mtu, 1432 1449 .ndo_tx_timeout = gelic_net_tx_timeout, 1433 1450 .ndo_set_mac_address = eth_mac_addr, 1434 1451 .ndo_validate_addr = eth_validate_addr, ··· 1493 1512 */ 1494 1513 netdev->features |= NETIF_F_VLAN_CHALLENGED; 1495 1514 } 1515 + 1516 + /* MTU range: 64 - 1518 */ 1517 + netdev->min_mtu = GELIC_NET_MIN_MTU; 1518 + netdev->max_mtu = GELIC_NET_MAX_MTU; 1496 1519 1497 1520 status = register_netdev(netdev); 1498 1521 if (status) {
-1
drivers/net/ethernet/toshiba/ps3_gelic_net.h
··· 373 373 int gelic_net_xmit(struct sk_buff *skb, struct net_device *netdev); 374 374 void gelic_net_set_multi(struct net_device *netdev); 375 375 void gelic_net_tx_timeout(struct net_device *netdev); 376 - int gelic_net_change_mtu(struct net_device *netdev, int new_mtu); 377 376 int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card); 378 377 379 378 /* shared ethtool ops */
-1
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
··· 2558 2558 .ndo_stop = gelic_wl_stop, 2559 2559 .ndo_start_xmit = gelic_net_xmit, 2560 2560 .ndo_set_rx_mode = gelic_net_set_multi, 2561 - .ndo_change_mtu = gelic_net_change_mtu, 2562 2561 .ndo_tx_timeout = gelic_net_tx_timeout, 2563 2562 .ndo_set_mac_address = eth_mac_addr, 2564 2563 .ndo_validate_addr = eth_validate_addr,
+4 -20
drivers/net/ethernet/toshiba/spider_net.c
··· 1279 1279 } 1280 1280 1281 1281 /** 1282 - * spider_net_change_mtu - changes the MTU of an interface 1283 - * @netdev: interface device structure 1284 - * @new_mtu: new MTU value 1285 - * 1286 - * returns 0 on success, <0 on failure 1287 - */ 1288 - static int 1289 - spider_net_change_mtu(struct net_device *netdev, int new_mtu) 1290 - { 1291 - /* no need to re-alloc skbs or so -- the max mtu is about 2.3k 1292 - * and mtu is outbound only anyway */ 1293 - if ( (new_mtu < SPIDER_NET_MIN_MTU ) || 1294 - (new_mtu > SPIDER_NET_MAX_MTU) ) 1295 - return -EINVAL; 1296 - netdev->mtu = new_mtu; 1297 - return 0; 1298 - } 1299 - 1300 - /** 1301 1282 * spider_net_set_mac - sets the MAC of an interface 1302 1283 * @netdev: interface device structure 1303 1284 * @ptr: pointer to new MAC address ··· 2210 2229 .ndo_start_xmit = spider_net_xmit, 2211 2230 .ndo_set_rx_mode = spider_net_set_multi, 2212 2231 .ndo_set_mac_address = spider_net_set_mac, 2213 - .ndo_change_mtu = spider_net_change_mtu, 2214 2232 .ndo_do_ioctl = spider_net_do_ioctl, 2215 2233 .ndo_tx_timeout = spider_net_tx_timeout, 2216 2234 .ndo_validate_addr = eth_validate_addr, ··· 2278 2298 netdev->features |= NETIF_F_IP_CSUM | NETIF_F_LLTX; 2279 2299 /* some time: NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | 2280 2300 * NETIF_F_HW_VLAN_CTAG_FILTER */ 2301 + 2302 + /* MTU range: 64 - 2294 */ 2303 + netdev->min_mtu = SPIDER_NET_MIN_MTU; 2304 + netdev->max_mtu = SPIDER_NET_MAX_MTU; 2281 2305 2282 2306 netdev->irq = card->pdev->irq; 2283 2307 card->num_rx_ints = 0;