6pack: convert to net_device_ops
authorStephen Hemminger <shemminger@linux-foundation.org>
Fri, 9 Jan 2009 13:01:28 +0000 (13:01 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Jan 2009 22:02:32 +0000 (14:02 -0800)
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hamradio/6pack.c

index 2d4089894ec7b13c61f7626c95b8fa991ca104a5..3da9f394b4c6d6616868d53ad3e8f6d528c7905a 100644 (file)
@@ -322,23 +322,25 @@ static const struct header_ops sp_header_ops = {
        .rebuild        = sp_rebuild_header,
 };
 
+static const struct net_device_ops sp_netdev_ops = {
+       .ndo_open               = sp_open_dev,
+       .ndo_stop               = sp_close,
+       .ndo_start_xmit         = sp_xmit,
+       .ndo_set_mac_address    = sp_set_mac_address,
+};
+
 static void sp_setup(struct net_device *dev)
 {
        /* Finish setting up the DEVICE info. */
-       dev->mtu                = SIXP_MTU;
-       dev->hard_start_xmit    = sp_xmit;
-       dev->open               = sp_open_dev;
+       dev->netdev_ops         = &sp_netdev_ops;
        dev->destructor         = free_netdev;
-       dev->stop               = sp_close;
-
-       dev->set_mac_address    = sp_set_mac_address;
+       dev->mtu                = SIXP_MTU;
        dev->hard_header_len    = AX25_MAX_HEADER_LEN;
        dev->header_ops         = &sp_header_ops;
 
        dev->addr_len           = AX25_ADDR_LEN;
        dev->type               = ARPHRD_AX25;
        dev->tx_queue_len       = 10;
-       dev->tx_timeout         = NULL;
 
        /* Only activated in AX.25 mode */
        memcpy(dev->broadcast, &ax25_bcast, AX25_ADDR_LEN);