Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / cavium / octeon / octeon_mgmt.c

diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
index 6cb2162..5e50bb1 100644 (file)
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
@@ -315,9 +315,9 @@ static void octeon_mgmt_clean_tx_buffers(struct octeon_mgmt *p)
                netif_wake_queue(p->netdev);
 }
 
-static void octeon_mgmt_clean_tx_tasklet(unsigned long arg)
+static void octeon_mgmt_clean_tx_tasklet(struct tasklet_struct *t)
 {
-       struct octeon_mgmt *p = (struct octeon_mgmt *)arg;
+       struct octeon_mgmt *p = from_tasklet(p, t, tx_clean_tasklet);
        octeon_mgmt_clean_tx_buffers(p);
        octeon_mgmt_enable_tx_irq(p);
 }
@@ -1491,8 +1491,8 @@ static int octeon_mgmt_probe(struct platform_device *pdev)
 
        skb_queue_head_init(&p->tx_list);
        skb_queue_head_init(&p->rx_list);
-       tasklet_init(&p->tx_clean_tasklet,
-                    octeon_mgmt_clean_tx_tasklet, (unsigned long)p);
+       tasklet_setup(&p->tx_clean_tasklet,
+                     octeon_mgmt_clean_tx_tasklet);
 
        netdev->priv_flags |= IFF_UNICAST_FLT;