serial: add support for the Lava Quattro PCI quad-port 16550A card

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

diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index de0de74..3fcebb7 100644 (file)
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -62,8 +62,9 @@ static int options[MAX_UNITS];
 #include "8390.h"
 
 /* These identify the driver base version and may not be removed. */
-static char version[] __devinitdata =
-KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " D. Becker/P. Gortmaker\n";
+static const char version[] __devinitconst =
+       KERN_INFO DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE
+       " D. Becker/P. Gortmaker\n";
 
 #if defined(__powerpc__)
 #define inl_le(addr)  le32_to_cpu(inl(addr))
@@ -200,6 +201,20 @@ struct ne2k_pci_card {
   in the 'dev' and 'ei_status' structures.
 */
 
+static const struct net_device_ops ne2k_netdev_ops = {
+       .ndo_open               = ne2k_pci_open,
+       .ndo_stop               = ne2k_pci_close,
+       .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 __devinit ne2k_pci_init_one (struct pci_dev *pdev,
                                     const struct pci_device_id *ent)
@@ -212,7 +227,6 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
        static unsigned int fnd_cnt;
        long ioaddr;
        int flags = pci_clone_list[chip_idx].flags;
-       DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -266,6 +280,8 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
                dev_err(&pdev->dev, "cannot allocate ethernet device\n");
                goto err_out_free_res;
        }
+       dev->netdev_ops = &ne2k_netdev_ops;
+
        SET_NETDEV_DEV(dev, &pdev->dev);
 
        /* Reset card. Who knows what dain-bramaged state it was left in. */
@@ -354,25 +370,20 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
        ei_status.block_output = &ne2k_pci_block_output;
        ei_status.get_8390_hdr = &ne2k_pci_get_8390_hdr;
        ei_status.priv = (unsigned long) pdev;
-       dev->open = &ne2k_pci_open;
-       dev->stop = &ne2k_pci_close;
+
        dev->ethtool_ops = &ne2k_pci_ethtool_ops;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = ei_poll;
-#endif
        NS8390_init(dev, 0);
 
+       memcpy(dev->dev_addr, SA_prom, dev->addr_len);
+       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+
        i = register_netdev(dev);
        if (i)
                goto err_out_free_netdev;
 
-       for(i = 0; i < 6; i++)
-               dev->dev_addr[i] = SA_prom[i];
-       printk("%s: %s found at %#lx, IRQ %d, %s.\n",
+       printk("%s: %s found at %#lx, IRQ %d, %pM.\n",
               dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,
-              print_mac(mac, dev->dev_addr));
-
-       memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
+              dev->dev_addr);
 
        return 0;
 
@@ -626,7 +637,7 @@ static void ne2k_pci_block_output(struct net_device *dev, int count,
 static void ne2k_pci_get_drvinfo(struct net_device *dev,
                                 struct ethtool_drvinfo *info)
 {
-       struct ei_device *ei = dev->priv;
+       struct ei_device *ei = netdev_priv(dev);
        struct pci_dev *pci_dev = (struct pci_dev *) ei->priv;
 
        strcpy(info->driver, DRV_NAME);