lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

irda: convert ali driver 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:40 +00:00
committed by David S. Miller
parent c279b8c996
commit 2d44a22254
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/net/irda/ali-ircc.c
View File

@@ -259,6 +259,20 @@ static void __exit ali_ircc_cleanup(void)
IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __func__); IRDA_DEBUG(2, "%s(), ----------------- End -----------------\n", __func__);
} }
static const struct net_device_ops ali_ircc_sir_ops = {
.ndo_open = ali_ircc_net_open,
.ndo_stop = ali_ircc_net_close,
.ndo_start_xmit = ali_ircc_sir_hard_xmit,
.ndo_do_ioctl = ali_ircc_net_ioctl,
};
static const struct net_device_ops ali_ircc_fir_ops = {
.ndo_open = ali_ircc_net_open,
.ndo_stop = ali_ircc_net_close,
.ndo_start_xmit = ali_ircc_fir_hard_xmit,
.ndo_do_ioctl = ali_ircc_net_ioctl,
};
/* /*
* Function ali_ircc_open (int i, chipio_t *inf) * Function ali_ircc_open (int i, chipio_t *inf)
* *
@@ -361,10 +375,7 @@ static int ali_ircc_open(int i, chipio_t *info)
self->tx_fifo.tail = self->tx_buff.head; self->tx_fifo.tail = self->tx_buff.head;
/* Override the network functions we need to use */ /* Override the network functions we need to use */
dev->hard_start_xmit = ali_ircc_sir_hard_xmit; dev->netdev_ops = &ali_ircc_sir_ops;
dev->open = ali_ircc_net_open;
dev->stop = ali_ircc_net_close;
dev->do_ioctl = ali_ircc_net_ioctl;
err = register_netdev(dev); err = register_netdev(dev);
if (err) { if (err) {
@@ -974,7 +985,7 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud)
ali_ircc_fir_change_speed(self, baud); ali_ircc_fir_change_speed(self, baud);
/* Install FIR xmit handler*/ /* Install FIR xmit handler*/
dev->hard_start_xmit = ali_ircc_fir_hard_xmit; dev->netdev_ops = &ali_ircc_fir_ops;
/* Enable Interuupt */ /* Enable Interuupt */
self->ier = IER_EOM; // benjamin 2000/11/20 07:24PM self->ier = IER_EOM; // benjamin 2000/11/20 07:24PM
@@ -988,7 +999,7 @@ static void ali_ircc_change_speed(struct ali_ircc_cb *self, __u32 baud)
ali_ircc_sir_change_speed(self, baud); ali_ircc_sir_change_speed(self, baud);
/* Install SIR xmit handler*/ /* Install SIR xmit handler*/
dev->hard_start_xmit = ali_ircc_sir_hard_xmit; dev->netdev_ops = &ali_ircc_sir_ops;
} }