kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

irda: convert via-ircc to net_device_ops

Browse source 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger 2009-03-20 19:35:43 +00:00 committed by David S. Miller
parent 02087be61a
commit 0bd11f27ed
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/net/irda/via-ircc.c
View file

@ -310,6 +310,19 @@ static void __exit via_ircc_cleanup(void)
pci_unregister_driver (&via_driver);
}
static const struct net_device_ops via_ircc_sir_ops = {
.ndo_start_xmit = via_ircc_hard_xmit_sir,
.ndo_open = via_ircc_net_open,
.ndo_stop = via_ircc_net_close,
.ndo_do_ioctl = via_ircc_net_ioctl,
};
static const struct net_device_ops via_ircc_fir_ops = {
.ndo_start_xmit = via_ircc_hard_xmit_fir,
.ndo_open = via_ircc_net_open,
.ndo_stop = via_ircc_net_close,
.ndo_do_ioctl = via_ircc_net_ioctl,
};
/*
* Function via_ircc_open (iobase, irq)
*
@ -428,10 +441,7 @@ static __devinit int via_ircc_open(int i, chipio_t * info, unsigned int id)
self->tx_fifo.tail = self->tx_buff.head;
/* Override the network functions we need to use */
dev->hard_start_xmit = via_ircc_hard_xmit_sir;
dev->open = via_ircc_net_open;
dev->stop = via_ircc_net_close;
dev->do_ioctl = via_ircc_net_ioctl;
dev->netdev_ops = &via_ircc_sir_ops;
err = register_netdev(dev);
if (err)
@ -798,11 +808,11 @@ static void via_ircc_change_speed(struct via_ircc_cb *self, __u32 speed)
if (speed > 115200) {
/* Install FIR xmit handler */
dev->hard_start_xmit = via_ircc_hard_xmit_fir;
dev->netdev_ops = &via_ircc_fir_ops;
via_ircc_dma_receive(self);
} else {
/* Install SIR xmit handler */
dev->hard_start_xmit = via_ircc_hard_xmit_sir;
dev->netdev_ops = &via_ircc_sir_ops;
}
netif_wake_queue(dev);
}