Commit 991990a1 authored by Krzysztof Hałasa's avatar Krzysztof Hałasa Committed by David S. Miller
Browse files

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: default avatarKrzysztof Hałasa <khc@pm.waw.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dff3fde7

drivers/char/pcmcia/synclink_cs.c

+11 −7
Original line number Diff line number Diff line
@@ -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,10 +4348,7 @@ 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->netdev_ops	    = &hdlcdev_ops;

	dev->watchdog_timeo = 10 * HZ;

	dev->tx_queue_len   = 50;

drivers/char/synclink.c

+11 −7
Original line number Diff line number Diff line
@@ -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,10 +8045,7 @@ 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->netdev_ops     = &hdlcdev_ops;

	dev->watchdog_timeo = 10 * HZ;

	dev->tx_queue_len   = 50;

drivers/char/synclink_gt.c

+11 −7
Original line number Diff line number Diff line
@@ -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,10 +1801,7 @@ 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->netdev_ops	    = &hdlcdev_ops;

	dev->watchdog_timeo = 10 * HZ;

	dev->tx_queue_len   = 50;

drivers/char/synclinkmp.c

+11 −7
Original line number Diff line number Diff line
@@ -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,10 +1945,7 @@ 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->netdev_ops	    = &hdlcdev_ops;

	dev->watchdog_timeo = 10 * HZ;

	dev->tx_queue_len   = 50;

drivers/net/wan/c101.c

+8 −4
Original line number Diff line number Diff line
@@ -296,7 +296,13 @@ static void c101_destroy_card(card_t *card) 
	kfree(card);

}





static const struct net_device_ops c101_ops = {

	.ndo_open       = c101_open,

	.ndo_stop       = c101_close,

	.ndo_change_mtu = hdlc_change_mtu,

	.ndo_start_xmit = hdlc_start_xmit,

	.ndo_do_ioctl   = c101_ioctl,

};



static int __init c101_run(unsigned long irq, unsigned long winbase)

{
@@ -367,9 +373,7 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) 
	dev->mem_start = winbase;

	dev->mem_end = winbase + C101_MAPPED_RAM_SIZE - 1;

	dev->tx_queue_len = 50;

	dev->do_ioctl = c101_ioctl;

	dev->open = c101_open;

	dev->stop = c101_close;

	dev->netdev_ops = &c101_ops;

	hdlc->attach = sca_attach;

	hdlc->xmit = sca_xmit;

	card->settings.clock_type = CLOCK_EXT;