projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[cascardo/linux.git]
/
net
/
atm
/
lec.c
diff --git
a/net/atm/lec.c
b/net/atm/lec.c
index
179e04b
..
38754fd
100644
(file)
--- a/
net/atm/lec.c
+++ b/
net/atm/lec.c
@@
-1607,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