sis900: convert to net_device_ops

Convert driver to new net_device_ops. Compile tested only.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index 9a363dc0db4125f1f1ce19dabf608eac4b802589..de740ebfafb6ba5709efd5312a0d725aea5e87a8 100644 (file)
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -381,6 +381,21 @@ static int __devinit sis96x_get_mac_addr(struct pci_dev * pci_dev,
        return 0;
 }
 
+static const struct net_device_ops sis900_netdev_ops = {
+       .ndo_open                = sis900_open,
+       .ndo_stop               = sis900_close,
+       .ndo_start_xmit         = sis900_start_xmit,
+       .ndo_set_config         = sis900_set_config,
+       .ndo_set_multicast_list = set_rx_mode,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_do_ioctl           = mii_ioctl,
+       .ndo_tx_timeout         = sis900_tx_timeout,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+        .ndo_poll_controller   = sis900_poll,
+#endif
+};
+
 /**
  *     sis900_probe - Probe for sis900 device
  *     @pci_dev: the sis900 pci device
@@ -461,20 +476,10 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
        sis_priv->rx_ring_dma = ring_dma;
 
        /* The SiS900-specific entries in the device structure. */
-       net_dev->open = &sis900_open;
-       net_dev->hard_start_xmit = &sis900_start_xmit;
-       net_dev->stop = &sis900_close;
-       net_dev->set_config = &sis900_set_config;
-       net_dev->set_multicast_list = &set_rx_mode;
-       net_dev->do_ioctl = &mii_ioctl;
-       net_dev->tx_timeout = sis900_tx_timeout;
+       net_dev->netdev_ops = &sis900_netdev_ops;
        net_dev->watchdog_timeo = TX_TIMEOUT;
        net_dev->ethtool_ops = &sis900_ethtool_ops;
 
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        net_dev->poll_controller = &sis900_poll;
-#endif
-
        if (sis900_debug > 0)
                sis_priv->msg_enable = sis900_debug;
        else