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

slip: convert to net_device_ops

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Stephen Hemminger and committed by
David S. Miller
b1da683d c4a80d7e

+17 -11
+17 -11
drivers/net/slip.c
··· 603 603 dev->mtu = sl->mtu; 604 604 dev->type = ARPHRD_SLIP + sl->mode; 605 605 #ifdef SL_CHECK_TRANSMIT 606 - dev->tx_timeout = sl_tx_timeout; 607 606 dev->watchdog_timeo = 20*HZ; 608 607 #endif 609 608 return 0; ··· 616 617 sl_free_bufs(sl); 617 618 } 618 619 620 + static const struct net_device_ops sl_netdev_ops = { 621 + .ndo_init = sl_init, 622 + .ndo_uninit = sl_uninit, 623 + .ndo_open = sl_open, 624 + .ndo_stop = sl_close, 625 + .ndo_start_xmit = sl_xmit, 626 + .ndo_get_stats = sl_get_stats, 627 + .ndo_change_mtu = sl_change_mtu, 628 + .ndo_tx_timeout = sl_tx_timeout, 629 + #ifdef CONFIG_SLIP_SMART 630 + .ndo_do_ioctl = sl_ioctl, 631 + #endif 632 + }; 633 + 634 + 619 635 static void sl_setup(struct net_device *dev) 620 636 { 621 - dev->init = sl_init; 622 - dev->uninit = sl_uninit; 623 - dev->open = sl_open; 637 + dev->netdev_ops = &sl_netdev_ops; 624 638 dev->destructor = free_netdev; 625 - dev->stop = sl_close; 626 - dev->get_stats = sl_get_stats; 627 - dev->change_mtu = sl_change_mtu; 628 - dev->hard_start_xmit = sl_xmit; 629 - #ifdef CONFIG_SLIP_SMART 630 - dev->do_ioctl = sl_ioctl; 631 - #endif 639 + 632 640 dev->hard_header_len = 0; 633 641 dev->addr_len = 0; 634 642 dev->tx_queue_len = 10;