From 297b071bf17b4bfe62140f1351cb927efe968145 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 26 Mar 2009 15:11:32 +0000 Subject: [PATCH] --- yaml --- r: 136083 b: refs/heads/master c: 462540bdb2f08d465a2416764fc628520f82939f h: refs/heads/master i: 136081: 9b0403821e058b4ef067d77a29608d43e0632a76 136079: 5cec9654cf429d55f73c68d44ba1b3c2aae0fd7e v: v3 --- [refs] | 2 +- trunk/drivers/net/lance.c | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e8da61caf0e7..6dd195c93964 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06e884031702f06b32ce20750ab3c46c596dc776 +refs/heads/master: 462540bdb2f08d465a2416764fc628520f82939f diff --git a/trunk/drivers/net/lance.c b/trunk/drivers/net/lance.c index d83d4010656d..633808d447be 100644 --- a/trunk/drivers/net/lance.c +++ b/trunk/drivers/net/lance.c @@ -454,6 +454,18 @@ struct net_device * __init lance_probe(int unit) } #endif +static const struct net_device_ops lance_netdev_ops = { + .ndo_open = lance_open, + .ndo_start_xmit = lance_start_xmit, + .ndo_stop = lance_close, + .ndo_get_stats = lance_get_stats, + .ndo_set_multicast_list = set_multicast_list, + .ndo_tx_timeout = lance_tx_timeout, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int options) { struct lance_private *lp; @@ -714,12 +726,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int printk(version); /* The LANCE-specific entries in the device structure. */ - dev->open = lance_open; - dev->hard_start_xmit = lance_start_xmit; - dev->stop = lance_close; - dev->get_stats = lance_get_stats; - dev->set_multicast_list = set_multicast_list; - dev->tx_timeout = lance_tx_timeout; + dev->netdev_ops = &lance_netdev_ops; dev->watchdog_timeo = TX_TIMEOUT; err = register_netdev(dev);