From 37233c8c09f2e906ea84df642ff4b383130ef38f Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Tue, 14 Apr 2009 18:30:21 +0000 Subject: [PATCH] --- yaml --- r: 143463 b: refs/heads/master c: 444f1a92702adb9865dd8f509fd55bca9c46a78e h: refs/heads/master i: 143461: ce559888dfb6c9e19b10d981a5cece4e7972e4a1 143459: b581c18d617eab8306770b34e1982e91dd43b484 143455: 4a231ab4cbd85312db3f09af1fac0b1d6f99a6d1 v: v3 --- [refs] | 2 +- trunk/drivers/net/a2065.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c35d9cf3d6a5..f83f2a2c1d3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af22ab1bd20e9dedf3a37cc1d401ef8bbd587ef0 +refs/heads/master: 444f1a92702adb9865dd8f509fd55bca9c46a78e diff --git a/trunk/drivers/net/a2065.c b/trunk/drivers/net/a2065.c index d0d0c2fee054..02f64d578641 100644 --- a/trunk/drivers/net/a2065.c +++ b/trunk/drivers/net/a2065.c @@ -692,6 +692,17 @@ static struct zorro_driver a2065_driver = { .remove = __devexit_p(a2065_remove_one), }; +static const struct net_device_ops lance_netdev_ops = { + .ndo_open = lance_open, + .ndo_stop = lance_close, + .ndo_start_xmit = lance_start_xmit, + .ndo_tx_timeout = lance_tx_timeout, + .ndo_set_multicast_list = lance_set_multicast, + .ndo_validate_addr = eth_validate_addr, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, +}; + static int __devinit a2065_init_one(struct zorro_dev *z, const struct zorro_device_id *ent) { @@ -753,12 +764,8 @@ static int __devinit a2065_init_one(struct zorro_dev *z, priv->rx_ring_mod_mask = RX_RING_MOD_MASK; priv->tx_ring_mod_mask = TX_RING_MOD_MASK; - dev->open = &lance_open; - dev->stop = &lance_close; - dev->hard_start_xmit = &lance_start_xmit; - dev->tx_timeout = &lance_tx_timeout; + dev->netdev_ops = &lance_netdev_ops; dev->watchdog_timeo = 5*HZ; - dev->set_multicast_list = &lance_set_multicast; dev->dma = 0; init_timer(&priv->multicast_timer);