1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 2d4089894ec7..3da9f394b4c6 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -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);