diff options
Diffstat (limited to 'drivers/net/lance.c')
| -rw-r--r-- | drivers/net/lance.c | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index d7afb938ea62..633808d447be 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c @@ -391,7 +391,8 @@ MODULE_LICENSE("GPL"); */ static int __init do_lance_probe(struct net_device *dev) { - int *port, result; + unsigned int *port; + int result; if (high_memory <= phys_to_virt(16*1024*1024)) lance_need_isa_bounce_buffers = 0; @@ -453,16 +454,28 @@ out: } #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; - long dma_channels; /* Mark spuriously-busy DMA channels */ + unsigned long dma_channels; /* Mark spuriously-busy DMA channels */ int i, reset_val, lance_version; const char *chipname; /* Flags for specific chips or boards. */ - unsigned char hpJ2405A = 0; /* HP ISA adaptor */ - int hp_builtin = 0; /* HP on-board ethernet. */ - static int did_version; /* Already printed version info. */ + unsigned char hpJ2405A = 0; /* HP ISA adaptor */ + int hp_builtin = 0; /* HP on-board ethernet. */ + static int did_version; /* Already printed version info. */ unsigned long flags; int err = -ENOMEM; void __iomem *bios; @@ -713,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); |
