nfsd: minor write_pool_threads exit cleanup

[safe/jmp/linux-2.6] / drivers / net / smc-mca.c

diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
index ae5f38d..c791ef7 100644 (file)
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
@@ -183,7 +183,7 @@ static char *smc_mca_adapter_names[] __initdata = {
 static int ultra_found = 0;
 
 
-static const struct net_device_ops ultra_netdev_ops = {
+static const struct net_device_ops ultramca_netdev_ops = {
        .ndo_open               = ultramca_open,
        .ndo_stop               = ultramca_close_card,
 
@@ -192,6 +192,7 @@ static const struct net_device_ops ultra_netdev_ops = {
        .ndo_get_stats          = ei_get_stats,
        .ndo_set_multicast_list = ei_set_multicast_list,
        .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_mac_address    = eth_mac_addr,
        .ndo_change_mtu         = eth_change_mtu,
 #ifdef CONFIG_NET_POLL_CONTROLLER
        .ndo_poll_controller    = ei_poll,
@@ -369,7 +370,7 @@ static int __init ultramca_probe(struct device *gen_dev)
 
        outb(reg4, ioaddr + 4);
 
-       gen_dev->driver_data = dev;
+       dev_set_drvdata(gen_dev, dev);
 
        /* The 8390 isn't at the base address, so fake the offset
         */
@@ -530,7 +531,7 @@ static int ultramca_close_card(struct net_device *dev)
 static int ultramca_remove(struct device *gen_dev)
 {
        struct mca_device *mca_dev = to_mca_device(gen_dev);
-       struct net_device *dev = (struct net_device *)gen_dev->driver_data;
+       struct net_device *dev = dev_get_drvdata(gen_dev);
 
        if (dev) {
                /* NB: ultra_close_card() does free_irq */