netxen: refresh firmware info after reset

[mv-sheeva.git] / drivers / net / dummy.c

diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 84e14f397d9ae1f5322dd0614855b6a53b5e3980..713ce6c532c5ce4f65f6fde6622e852dc32e2e01 100644 (file)
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -57,18 +57,23 @@ static void set_multicast_list(struct net_device *dev)
 {
 }
 
+static const struct net_device_ops dummy_netdev_ops = {
+       .ndo_start_xmit         = dummy_xmit,
+       .ndo_validate_addr      = eth_validate_addr,
+       .ndo_set_multicast_list = set_multicast_list,
+       .ndo_set_mac_address    = dummy_set_address,
+};
+
 static void dummy_setup(struct net_device *dev)
 {
+       ether_setup(dev);
+
        /* Initialize the device structure. */
-       dev->hard_start_xmit = dummy_xmit;
-       dev->set_multicast_list = set_multicast_list;
-       dev->set_mac_address = dummy_set_address;
+       dev->netdev_ops = &dummy_netdev_ops;
        dev->destructor = free_netdev;
 
        /* Fill in device structure with ethernet-generic values. */
-       ether_setup(dev);
        dev->tx_queue_len = 0;
-       dev->change_mtu = NULL;
        dev->flags |= IFF_NOARP;
        dev->flags &= ~IFF_MULTICAST;
        random_ether_addr(dev->dev_addr);
@@ -80,7 +85,7 @@ static int dummy_xmit(struct sk_buff *skb, struct net_device *dev)
        dev->stats.tx_bytes += skb->len;
 
        dev_kfree_skb(skb);
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])