diff options
Diffstat (limited to 'net/atm/lec.c')
-rw-r--r-- | net/atm/lec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index 181d70c73d70..38754fdb88ba 100644 --- 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) | |||
816 | if (arg < 0 || arg >= MAX_LEC_ITF || !dev_lec[arg]) | 816 | if (arg < 0 || arg >= MAX_LEC_ITF || !dev_lec[arg]) |
817 | return -EINVAL; | 817 | return -EINVAL; |
818 | vcc->proto_data = dev_lec[arg]; | 818 | vcc->proto_data = dev_lec[arg]; |
819 | return lec_mcast_make((struct lec_priv *)netdev_priv(dev_lec[arg]), | 819 | return lec_mcast_make(netdev_priv(dev_lec[arg]), vcc); |
820 | vcc); | ||
821 | } | 820 | } |
822 | 821 | ||
823 | /* Initialize device. */ | 822 | /* Initialize device. */ |
@@ -1608,7 +1607,7 @@ static void lec_arp_destroy(struct lec_priv *priv) | |||
1608 | struct lec_arp_table *entry; | 1607 | struct lec_arp_table *entry; |
1609 | int i; | 1608 | int i; |
1610 | 1609 | ||
1611 | cancel_rearming_delayed_work(&priv->lec_arp_work); | 1610 | cancel_delayed_work_sync(&priv->lec_arp_work); |
1612 | 1611 | ||
1613 | /* | 1612 | /* |
1614 | * Remove all entries | 1613 | * Remove all entries |