e1000e: perform 10/100 adaptive IFS only on parts that support it

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

diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index b144863..eac7338 100644 (file)
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -143,10 +143,25 @@ out:
 }
 #endif
 
+static const struct net_device_ops ac_netdev_ops = {
+       .ndo_open               = ac_open,
+       .ndo_stop               = ac_close_card,
+
+       .ndo_start_xmit         = ei_start_xmit,
+       .ndo_tx_timeout         = ei_tx_timeout,
+       .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,
+#endif
+};
+
 static int __init ac_probe1(int ioaddr, struct net_device *dev)
 {
        int i, retval;
-       DECLARE_MAC_BUF(mac);
 
        if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME))
                return -EBUSY;
@@ -171,8 +186,8 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
        for (i = 0; i < 6; i++)
                dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i);
 
-       printk(KERN_DEBUG "AC3200 in EISA slot %d, node %s",
-              ioaddr/0x1000, print_mac(mac, dev->dev_addr));
+       printk(KERN_DEBUG "AC3200 in EISA slot %d, node %pM",
+              ioaddr/0x1000, dev->dev_addr);
 #if 0
        /* Check the vendor ID/prefix. Redundant after checking the EISA ID */
        if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0
@@ -254,11 +269,7 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
        ei_status.block_output = &ac_block_output;
        ei_status.get_8390_hdr = &ac_get_8390_hdr;
 
-       dev->open = &ac_open;
-       dev->stop = &ac_close_card;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = ei_poll;
-#endif
+       dev->netdev_ops = &ac_netdev_ops;
        NS8390_init(dev, 0);
 
        retval = register_netdev(dev);