diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2009-01-09 08:01:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-21 17:02:39 -0500 |
commit | ff908cf83498010e832819cf50a23e16c43b1373 (patch) | |
tree | e1afb8e5e164ef1d481af1a79e2636e29ab1cb20 | |
parent | 3f75f7482f7687b8ffe9e0ddad560797a9f9ad6e (diff) |
scc: convert to internal net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/hamradio/scc.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index c011af7088ea..49f9d2491d47 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
@@ -1542,23 +1542,24 @@ static int scc_net_alloc(const char *name, struct scc_channel *scc) | |||
1542 | /* * Network driver methods * */ | 1542 | /* * Network driver methods * */ |
1543 | /* ******************************************************************** */ | 1543 | /* ******************************************************************** */ |
1544 | 1544 | ||
1545 | static const struct net_device_ops scc_netdev_ops = { | ||
1546 | .ndo_open = scc_net_open, | ||
1547 | .ndo_stop = scc_net_close, | ||
1548 | .ndo_start_xmit = scc_net_tx, | ||
1549 | .ndo_set_mac_address = scc_net_set_mac_address, | ||
1550 | .ndo_get_stats = scc_net_get_stats, | ||
1551 | .ndo_do_ioctl = scc_net_ioctl, | ||
1552 | }; | ||
1553 | |||
1545 | /* ----> Initialize device <----- */ | 1554 | /* ----> Initialize device <----- */ |
1546 | 1555 | ||
1547 | static void scc_net_setup(struct net_device *dev) | 1556 | static void scc_net_setup(struct net_device *dev) |
1548 | { | 1557 | { |
1549 | dev->tx_queue_len = 16; /* should be enough... */ | 1558 | dev->tx_queue_len = 16; /* should be enough... */ |
1550 | 1559 | ||
1551 | dev->open = scc_net_open; | 1560 | dev->netdev_ops = &scc_netdev_ops; |
1552 | dev->stop = scc_net_close; | ||
1553 | |||
1554 | dev->hard_start_xmit = scc_net_tx; | ||
1555 | dev->header_ops = &ax25_header_ops; | 1561 | dev->header_ops = &ax25_header_ops; |
1556 | 1562 | ||
1557 | dev->set_mac_address = scc_net_set_mac_address; | ||
1558 | dev->get_stats = scc_net_get_stats; | ||
1559 | dev->do_ioctl = scc_net_ioctl; | ||
1560 | dev->tx_timeout = NULL; | ||
1561 | |||
1562 | memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN); | 1563 | memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN); |
1563 | memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN); | 1564 | memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN); |
1564 | 1565 | ||