Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[linux-block.git] / drivers / net / irda / ali-ircc.c

diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index 17779f9bffc4544b5fea9c84e4c6982041575ad3..ad179558002803e2f7af704d8f9bef9ade4a9bfe 100644 (file)
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -259,6 +259,20 @@ static void __exit ali_ircc_cleanup(void)
        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)
  *
@@ -361,10 +375,7 @@ static int ali_ircc_open(int i, chipio_t *info)
        self->tx_fifo.tail = self->tx_buff.head;
 
        /* Override the network functions we need to use */
-       dev->hard_start_xmit = ali_ircc_sir_hard_xmit;
-       dev->open            = ali_ircc_net_open;
-       dev->stop            = ali_ircc_net_close;
-       dev->do_ioctl        = ali_ircc_net_ioctl;
+       dev->netdev_ops = &ali_ircc_sir_ops;
 
        err = register_netdev(dev);
        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);                  
                
                /* Install FIR xmit handler*/
-               dev->hard_start_xmit = ali_ircc_fir_hard_xmit;          
+               dev->netdev_ops = &ali_ircc_fir_ops;
                                
                /* Enable Interuupt */
                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);
                                
                /* Install SIR xmit handler*/
-               dev->hard_start_xmit = ali_ircc_sir_hard_xmit;
+               dev->netdev_ops = &ali_ircc_sir_ops;
        }