Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / atm / lec.c

diff --git a/net/atm/lec.c b/net/atm/lec.c
index 181d70c73d708bd730f49e4b61f88ac72e373a20..38754fdb88babc634717cc2b0cd6eba297e119bd 100644 (file)
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -816,8 +816,7 @@ static int lec_mcast_attach(struct atm_vcc *vcc, int arg)
        if (arg < 0 || arg >= MAX_LEC_ITF || !dev_lec[arg])
                return -EINVAL;
        vcc->proto_data = dev_lec[arg];
-       return lec_mcast_make((struct lec_priv *)netdev_priv(dev_lec[arg]),
-                               vcc);
+       return lec_mcast_make(netdev_priv(dev_lec[arg]), vcc);
 }
 
 /* Initialize device. */
@@ -1608,7 +1607,7 @@ static void lec_arp_destroy(struct lec_priv *priv)
        struct lec_arp_table *entry;
        int i;
 
-       cancel_rearming_delayed_work(&priv->lec_arp_work);
+       cancel_delayed_work_sync(&priv->lec_arp_work);
 
        /*
         * Remove all entries