WAN: Convert generic HDLC drivers to netdev_ops.

Also remove unneeded last_rx update from Synclink drivers.
Synclink part mostly by Stephen Hemminger.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 44 insertions, 28 deletions

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index dc073e167abc..5608a1e5a3b3 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -4311,10 +4311,17 @@ static void hdlcdev_rx(MGSLPC_INFO *info, char *buf, int size)
         dev->stats.rx_bytes += size;
 
         netif_rx(skb);
-
-        dev->last_rx = jiffies;
 }
 
+static const struct net_device_ops hdlcdev_ops = {
+        .ndo_open       = hdlcdev_open,
+        .ndo_stop       = hdlcdev_close,
+        .ndo_change_mtu = hdlc_change_mtu,
+        .ndo_start_xmit = hdlc_start_xmit,
+        .ndo_do_ioctl   = hdlcdev_ioctl,
+        .ndo_tx_timeout = hdlcdev_tx_timeout,
+};
+
 /**
  * called by device driver when adding device instance
  * do generic HDLC initialization
@@ -4341,11 +4348,8 @@ static int hdlcdev_init(MGSLPC_INFO *info)
         dev->irq       = info->irq_level;
 
         /* network layer callbacks and settings */
-        dev->do_ioctl       = hdlcdev_ioctl;
-        dev->open           = hdlcdev_open;
-        dev->stop           = hdlcdev_close;
-        dev->tx_timeout     = hdlcdev_tx_timeout;
-        dev->watchdog_timeo = 10*HZ;
+        dev->netdev_ops     = &hdlcdev_ops;
+        dev->watchdog_timeo = 10 * HZ;
         dev->tx_queue_len   = 50;
 
         /* generic HDLC layer callbacks and settings */
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index b8063d4cad32..0057a8f58cb1 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -8007,10 +8007,17 @@ static void hdlcdev_rx(struct mgsl_struct *info, char *buf, int size)
         dev->stats.rx_bytes += size;
 
         netif_rx(skb);
-
-        dev->last_rx = jiffies;
 }
 
+static const struct net_device_ops hdlcdev_ops = {
+        .ndo_open       = hdlcdev_open,
+        .ndo_stop       = hdlcdev_close,
+        .ndo_change_mtu = hdlc_change_mtu,
+        .ndo_start_xmit = hdlc_start_xmit,
+        .ndo_do_ioctl   = hdlcdev_ioctl,
+        .ndo_tx_timeout = hdlcdev_tx_timeout,
+};
+
 /**
  * called by device driver when adding device instance
  * do generic HDLC initialization
@@ -8038,11 +8045,8 @@ static int hdlcdev_init(struct mgsl_struct *info)
         dev->dma       = info->dma_level;
 
         /* network layer callbacks and settings */
-        dev->do_ioctl       = hdlcdev_ioctl;
-        dev->open           = hdlcdev_open;
-        dev->stop           = hdlcdev_close;
-        dev->tx_timeout     = hdlcdev_tx_timeout;
-        dev->watchdog_timeo = 10*HZ;
+        dev->netdev_ops     = &hdlcdev_ops;
+        dev->watchdog_timeo = 10 * HZ;
         dev->tx_queue_len   = 50;
 
         /* generic HDLC layer callbacks and settings */
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index f329f459817c..efb3dc928a43 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -1763,10 +1763,17 @@ static void hdlcdev_rx(struct slgt_info *info, char *buf, int size)
         dev->stats.rx_bytes += size;
 
         netif_rx(skb);
-
-        dev->last_rx = jiffies;
 }
 
+static const struct net_device_ops hdlcdev_ops = {
+        .ndo_open       = hdlcdev_open,
+        .ndo_stop       = hdlcdev_close,
+        .ndo_change_mtu = hdlc_change_mtu,
+        .ndo_start_xmit = hdlc_start_xmit,
+        .ndo_do_ioctl   = hdlcdev_ioctl,
+        .ndo_tx_timeout = hdlcdev_tx_timeout,
+};
+
 /**
  * called by device driver when adding device instance
  * do generic HDLC initialization
@@ -1794,11 +1801,8 @@ static int hdlcdev_init(struct slgt_info *info)
         dev->irq       = info->irq_level;
 
         /* network layer callbacks and settings */
-        dev->do_ioctl       = hdlcdev_ioctl;
-        dev->open           = hdlcdev_open;
-        dev->stop           = hdlcdev_close;
-        dev->tx_timeout     = hdlcdev_tx_timeout;
-        dev->watchdog_timeo = 10*HZ;
+        dev->netdev_ops     = &hdlcdev_ops;
+        dev->watchdog_timeo = 10 * HZ;
         dev->tx_queue_len   = 50;
 
         /* generic HDLC layer callbacks and settings */
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 7b0c5b2dd263..8eb6c89a980e 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -1907,10 +1907,17 @@ static void hdlcdev_rx(SLMP_INFO *info, char *buf, int size)
         dev->stats.rx_bytes += size;
 
         netif_rx(skb);
-
-        dev->last_rx = jiffies;
 }
 
+static const struct net_device_ops hdlcdev_ops = {
+        .ndo_open       = hdlcdev_open,
+        .ndo_stop       = hdlcdev_close,
+        .ndo_change_mtu = hdlc_change_mtu,
+        .ndo_start_xmit = hdlc_start_xmit,
+        .ndo_do_ioctl   = hdlcdev_ioctl,
+        .ndo_tx_timeout = hdlcdev_tx_timeout,
+};
+
 /**
  * called by device driver when adding device instance
  * do generic HDLC initialization
@@ -1938,11 +1945,8 @@ static int hdlcdev_init(SLMP_INFO *info)
         dev->irq       = info->irq_level;
 
         /* network layer callbacks and settings */
-        dev->do_ioctl       = hdlcdev_ioctl;
-        dev->open           = hdlcdev_open;
-        dev->stop           = hdlcdev_close;
-        dev->tx_timeout     = hdlcdev_tx_timeout;
-        dev->watchdog_timeo = 10*HZ;
+        dev->netdev_ops     = &hdlcdev_ops;
+        dev->watchdog_timeo = 10 * HZ;
         dev->tx_queue_len   = 50;
 
         /* generic HDLC layer callbacks and settings */