summaryrefslogtreecommitdiffstats
path: root/sys/dev/cp
diff options
context:
space:
mode:
authorrik <rik@FreeBSD.org>2004-12-03 16:57:15 +0000
committerrik <rik@FreeBSD.org>2004-12-03 16:57:15 +0000
commit0dc1d9670600ab1587b39956aa39d323ad8261bb (patch)
tree99796a5bc6860fdea8521ca82dee114780bc35b2 /sys/dev/cp
parent03bb845633c916832e0dace69b78101660e5a183 (diff)
downloadFreeBSD-src-0dc1d9670600ab1587b39956aa39d323ad8261bb.zip
FreeBSD-src-0dc1d9670600ab1587b39956aa39d323ad8261bb.tar.gz
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.
Diffstat (limited to 'sys/dev/cp')
-rw-r--r--sys/dev/cp/if_cp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index ec9b73e..ace4a29 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -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);
}
/*
OpenPOWER on IntegriCloud