Don not call pp_down()/pp_up() form XX_tlf()/XX_tls() in non PPP mode

to privent running of PPP's state machine in non PPP mode.

MFC: after 3 days.
This commit is contained in:
rik 2004-12-03 16:57:15 +00:00
parent d960c94ecf
commit 0b04552e35
3 changed files with 12 additions and 6 deletions

View File

@ -658,7 +658,8 @@ static void cp_tlf (struct sppp *sp)
CP_DEBUG2 (d, ("cp_tlf\n"));
/* cp_set_dtr (d->chan, 0);*/
/* cp_set_rts (d->chan, 0);*/
sp->pp_down (sp);
if (!(d->pp.pp_flags & PP_FR) && !(d->pp.pp_if.if_flags & PP_CISCO))
sp->pp_down (sp);
}
static void cp_tls (struct sppp *sp)
@ -666,7 +667,8 @@ static void cp_tls (struct sppp *sp)
drv_t *d = sp->pp_if.if_softc;
CP_DEBUG2 (d, ("cp_tls\n"));
sp->pp_up (sp);
if (!(d->pp.pp_flags & PP_FR) && !(d->pp.pp_if.if_flags & PP_CISCO))
sp->pp_up (sp);
}
/*

View File

@ -875,7 +875,8 @@ static void ct_tlf (struct sppp *sp)
CT_DEBUG (d, ("ct_tlf\n"));
/* ct_set_dtr (d->chan, 0);*/
/* ct_set_rts (d->chan, 0);*/
sp->pp_down (sp);
if (!(d->pp.pp_flags & PP_FR) && !(d->pp.pp_if.if_flags & PP_CISCO))
sp->pp_down (sp);
}
static void ct_tls (struct sppp *sp)
@ -883,7 +884,8 @@ static void ct_tls (struct sppp *sp)
drv_t *d = sp->pp_if.if_softc;
CT_DEBUG (d, ("ct_tls\n"));
sp->pp_up (sp);
if (!(d->pp.pp_flags & PP_FR) && !(d->pp.pp_if.if_flags & PP_CISCO))
sp->pp_up (sp);
}
/*

View File

@ -946,7 +946,8 @@ static void cx_tlf (struct sppp *sp)
CX_DEBUG (d, ("cx_tlf\n"));
/* cx_set_dtr (d->chan, 0);*/
/* cx_set_rts (d->chan, 0);*/
sp->pp_down (sp);
if (!(d->pp.pp_flags & PP_FR) && !(d->pp.pp_if.if_flags & PP_CISCO))
sp->pp_down (sp);
}
static void cx_tls (struct sppp *sp)
@ -954,7 +955,8 @@ static void cx_tls (struct sppp *sp)
drv_t *d = sp->pp_if.if_softc;
CX_DEBUG (d, ("cx_tls\n"));
sp->pp_up (sp);
if (!(d->pp.pp_flags & PP_FR) && !(d->pp.pp_if.if_flags & PP_CISCO))
sp->pp_up (sp);
}
/*