Merge branch 'i2c-for-2630-v2' of git://aeryn.fluff.org.uk/bjdooks/linux

[linux-2.6-omap-h63xx.git] / drivers / net / tlan.c

diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 85ef8b744557621f335134b2be61a119be72d09c..aa6964922d5e20b54be7d5c6238b2ca72312a8f3 100644 (file)
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -570,7 +570,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
 
                priv->adapter = &board_info[ent->driver_data];
 
-               rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
+               rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                if (rc) {
                        printk(KERN_ERR "TLAN: No suitable PCI mapping available.\n");
                        goto err_out_free_dev;
@@ -831,6 +831,21 @@ static void TLan_Poll(struct net_device *dev)
 }
 #endif
 
+static const struct net_device_ops TLan_netdev_ops = {
+       .ndo_open               = TLan_Open,
+       .ndo_stop               = TLan_Close,
+       .ndo_start_xmit         = TLan_StartTx,
+       .ndo_tx_timeout         = TLan_tx_timeout,
+       .ndo_get_stats          = TLan_GetStats,
+       .ndo_set_multicast_list = TLan_SetMulticastList,
+       .ndo_do_ioctl           = TLan_ioctl,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_validate_addr      = eth_validate_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller     = TLan_Poll,
+#endif
+};
 
 
 
@@ -892,16 +907,7 @@ static int TLan_Init( struct net_device *dev )
        netif_carrier_off(dev);
 
        /* Device methods */
-       dev->open = &TLan_Open;
-       dev->hard_start_xmit = &TLan_StartTx;
-       dev->stop = &TLan_Close;
-       dev->get_stats = &TLan_GetStats;
-       dev->set_multicast_list = &TLan_SetMulticastList;
-       dev->do_ioctl = &TLan_ioctl;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-       dev->poll_controller = &TLan_Poll;
-#endif
-       dev->tx_timeout = &TLan_tx_timeout;
+       dev->netdev_ops = &TLan_netdev_ops;
        dev->watchdog_timeo = TX_TIMEOUT;
 
        return 0;