]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
net: switch kaweth driver to netdevops
authorOliver Neukum <oneukum@suse.de>
Thu, 8 Jan 2009 19:20:22 +0000 (11:20 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Jan 2009 19:20:22 +0000 (11:20 -0800)
This converts the kaweth ethernet USB driver to netdevops.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/kaweth.c

index 3073ca25a0b06bdffcfa1df3895fbcdfc7096a8f..7cb10a0a53164dc45650a7225ae95c38e4517557 100644 (file)
@@ -251,7 +251,6 @@ struct kaweth_device
        struct net_device_stats stats;
 };
 
-
 /****************************************************************
  *     kaweth_control
  ****************************************************************/
@@ -975,6 +974,17 @@ static int kaweth_resume(struct usb_interface *intf)
 /****************************************************************
  *     kaweth_probe
  ****************************************************************/
+
+
+static const struct net_device_ops kaweth_netdev_ops = {
+       .ndo_open =                     kaweth_open,
+       .ndo_stop =                     kaweth_close,
+       .ndo_start_xmit =               kaweth_start_xmit,
+       .ndo_tx_timeout =               kaweth_tx_timeout,
+       .ndo_set_multicast_list =       kaweth_set_rx_mode,
+       .ndo_get_stats =                kaweth_netdev_stats,
+};
+
 static int kaweth_probe(
                struct usb_interface *intf,
                const struct usb_device_id *id      /* from id_table */
@@ -1147,22 +1157,13 @@ err_fw:
        memcpy(netdev->dev_addr, &kaweth->configuration.hw_addr,
                sizeof(kaweth->configuration.hw_addr));
 
-       netdev->open = kaweth_open;
-       netdev->stop = kaweth_close;
-
+       netdev->netdev_ops = &kaweth_netdev_ops;
        netdev->watchdog_timeo = KAWETH_TX_TIMEOUT;
-       netdev->tx_timeout = kaweth_tx_timeout;
-
-       netdev->hard_start_xmit = kaweth_start_xmit;
-       netdev->set_multicast_list = kaweth_set_rx_mode;
-       netdev->get_stats = kaweth_netdev_stats;
        netdev->mtu = le16_to_cpu(kaweth->configuration.segment_size);
        SET_ETHTOOL_OPS(netdev, &ops);
 
        /* kaweth is zeroed as part of alloc_netdev */
-
        INIT_DELAYED_WORK(&kaweth->lowmem_work, kaweth_resubmit_tl);
-
        usb_set_intfdata(intf, kaweth);
 
 #if 0