* Remove cli()/restore()
Please apply
Paul Fulghum
[email protected]
--- linux-2.5.41/drivers/net/wan/syncppp.c Mon Oct 7 13:23:38 2002
+++ linux-2.5.41-mg/drivers/net/wan/syncppp.c Wed Oct 9 15:55:47 2002
@@ -1284,12 +1284,12 @@
{
struct sppp *sp = (struct sppp*) arg;
unsigned long flags;
- save_flags(flags);
- cli();
+
+ spin_lock_irqsave(&spppq_lock, flags);
sp->pp_flags &= ~PP_TIMO;
if (! (sp->pp_if->flags & IFF_UP) || (sp->pp_flags & PP_CISCO)) {
- restore_flags(flags);
+ spin_unlock_irqrestore(&spppq_lock, flags);
return;
}
switch (sp->lcp.state) {
@@ -1328,7 +1328,7 @@
}
break;
}
- restore_flags(flags);
+ spin_unlock_irqrestore(&spppq_lock, flags);
}
static char *sppp_lcp_type_name (u8 type)