Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30a5d7f7 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

irda: convert vlsi driver to net_device_ops 



Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2d44a222

drivers/net/irda/vlsi_ir.c

+9 −5
Original line number Diff line number Diff line
@@ -1573,6 +1573,14 @@ static int vlsi_close(struct net_device *ndev) 
	return 0;

}



static const struct net_device_ops vlsi_netdev_ops = {

	.ndo_open       = vlsi_open,

	.ndo_stop       = vlsi_close,

	.ndo_start_xmit = vlsi_hard_start_xmit,

	.ndo_do_ioctl   = vlsi_ioctl,

	.ndo_tx_timeout = vlsi_tx_timeout,

};



static int vlsi_irda_init(struct net_device *ndev)

{

	vlsi_irda_dev_t *idev = netdev_priv(ndev);
@@ -1608,11 +1616,7 @@ static int vlsi_irda_init(struct net_device *ndev) 
	ndev->flags |= IFF_PORTSEL | IFF_AUTOMEDIA;

	ndev->if_port = IF_PORT_UNKNOWN;

 

	ndev->open	      = vlsi_open;

	ndev->stop	      = vlsi_close;

	ndev->hard_start_xmit = vlsi_hard_start_xmit;

	ndev->do_ioctl	      = vlsi_ioctl;

	ndev->tx_timeout      = vlsi_tx_timeout;

	ndev->netdev_ops = &vlsi_netdev_ops;

	ndev->watchdog_timeo  = 500*HZ/1000;	/* max. allowed turn time for IrLAP */



	SET_NETDEV_DEV(ndev, &pdev->dev);