Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / net / tokenring / 3c359.c

diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 43853e3b210e42977100f1c1b3828a3dfa9fe623..4a65fc2dd9282ffef9dc72a92a559c90b85dd7e3 100644 (file)
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -274,6 +274,15 @@ static void  xl_ee_write(struct net_device *dev, int ee_addr, u16 ee_value)
        
        return ; 
 }
+
+static const struct net_device_ops xl_netdev_ops = {
+       .ndo_open               = xl_open,
+       .ndo_stop               = xl_close,
+       .ndo_start_xmit         = xl_xmit,
+       .ndo_change_mtu         = xl_change_mtu,
+       .ndo_set_multicast_list = xl_set_rx_mode,
+       .ndo_set_mac_address    = xl_set_mac_address,
+};
  
 static int __devinit xl_probe(struct pci_dev *pdev,
                              const struct pci_device_id *ent) 
@@ -337,13 +346,7 @@ static int __devinit xl_probe(struct pci_dev *pdev,
                return i ; 
        }                               
 
-       dev->open=&xl_open;
-       dev->hard_start_xmit=&xl_xmit;
-       dev->change_mtu=&xl_change_mtu;
-       dev->stop=&xl_close;
-       dev->do_ioctl=NULL;
-       dev->set_multicast_list=&xl_set_rx_mode;
-       dev->set_mac_address=&xl_set_mac_address ; 
+       dev->netdev_ops = &xl_netdev_ops;
        SET_NETDEV_DEV(dev, &pdev->dev);
 
        pci_set_drvdata(pdev,dev) ;