wl1251: rename reg.h to wl1251_reg.h

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

diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 97d6856..ecf3279 100644 (file)
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -594,7 +594,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
        len = skb->len;
        if (len < ETH_ZLEN) {
                if (skb_padto(skb, ETH_ZLEN))
-                       return 0;
+                       return NETDEV_TX_OK;
                len = ETH_ZLEN;
        }
 
@@ -642,7 +642,7 @@ static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
                netif_stop_queue(dev);
        spin_unlock_irqrestore(&sp->tx_lock, flags);
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static void timeout(struct net_device *dev)
@@ -709,7 +709,18 @@ static inline void setup_rx_ring(struct net_device *dev,
        dma_sync_desc_dev(dev, &buf[i]);
 }
 
-static int __init sgiseeq_probe(struct platform_device *pdev)
+static const struct net_device_ops sgiseeq_netdev_ops = {
+       .ndo_open               = sgiseeq_open,
+       .ndo_stop               = sgiseeq_close,
+       .ndo_start_xmit         = sgiseeq_start_xmit,
+       .ndo_tx_timeout         = timeout,
+       .ndo_set_multicast_list = sgiseeq_set_multicast,
+       .ndo_set_mac_address    = sgiseeq_set_mac_address,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_validate_addr      = eth_validate_addr,
+};
+
+static int __devinit sgiseeq_probe(struct platform_device *pdev)
 {
        struct sgiseeq_platform_data *pd = pdev->dev.platform_data;
        struct hpc3_regs *hpcregs = pd->hpc;
@@ -775,13 +786,8 @@ static int __init sgiseeq_probe(struct platform_device *pdev)
                              SEEQ_CTRL_SFLAG | SEEQ_CTRL_ESHORT |
                              SEEQ_CTRL_ENCARR;
 
-       dev->open               = sgiseeq_open;
-       dev->stop               = sgiseeq_close;
-       dev->hard_start_xmit    = sgiseeq_start_xmit;
-       dev->tx_timeout         = timeout;
+       dev->netdev_ops         = &sgiseeq_netdev_ops;
        dev->watchdog_timeo     = (200 * HZ) / 1000;
-       dev->set_multicast_list = sgiseeq_set_multicast;
-       dev->set_mac_address    = sgiseeq_set_mac_address;
        dev->irq                = irq;
 
        if (register_netdev(dev)) {