26c26
< * $FreeBSD: head/usr.sbin/ppp/ncp.c 81888 2001-08-18 13:04:52Z brian $
---
> * $FreeBSD: head/usr.sbin/ppp/ncp.c 81897 2001-08-18 19:07:13Z brian $
93d92
< #include "probe.h"
137,139c136,137
< if (probe.ipv6_available)
< ipv6cp_Init(&ncp->ipv6cp, bundle, &bundle->links->physical->link,
< &bundle->fsm);
---
> ipv6cp_Init(&ncp->ipv6cp, bundle, &bundle->links->physical->link,
> &bundle->fsm);
148,149c146
< if (probe.ipv6_available)
< ipv6cp_Destroy(&ncp->ipv6cp);
---
> ipv6cp_Destroy(&ncp->ipv6cp);
178c175
< if (probe.ipv6_available && Enabled(bundle, OPT_IPV6CP)) {
---
> if (Enabled(bundle, OPT_IPV6CP)) {
215,216c212
< if (probe.ipv6_available)
< ipv6cp_SetLink(&ncp->ipv6cp, l);
---
> ipv6cp_SetLink(&ncp->ipv6cp, l);
284,285c280
< if (probe.ipv6_available)
< result += ipv6cp_QueueLen(&ncp->ipv6cp);
---
> result += ipv6cp_QueueLen(&ncp->ipv6cp);
312,315c307,309
< if (probe.ipv6_available)
< for (q = ipv6cp->Queue; q < ipv6cp->Queue + IPV6CP_QUEUES(ipv6cp); q++)
< while (q->top)
< m_freem(m_dequeue(q));
---
> for (q = ipv6cp->Queue; q < ipv6cp->Queue + IPV6CP_QUEUES(ipv6cp); q++)
> while (q->top)
> m_freem(m_dequeue(q));
361,363c355
< if (!probe.ipv6_available)
< res = ipcp_PushPacket(&bundle->ncp.ipcp, l);
< else if (*af == AF_INET) {
---
> if (*af == AF_INET) {
459,461c451,452
< if (probe.ipv6_available)
< prompt_Printf(arg->prompt, "Next queued AF: %s\n",
< ncp->afq == AF_INET6 ? "inet6" : "inet");
---
> prompt_Printf(arg->prompt, "Next queued AF: %s\n",
> ncp->afq == AF_INET6 ? "inet6" : "inet");
514,515c505
< if (probe.ipv6_available)
< n += !!(ncp->ipv6cp.fsm.state == ST_OPENED);
---
> n += !!(ncp->ipv6cp.fsm.state == ST_OPENED);
531,534c521,523
< if (probe.ipv6_available)
< if (ncp->ipv6cp.fsm.state > ST_CLOSED ||
< ncp->ipv6cp.fsm.state == ST_STARTING)
< n++;
---
> if (ncp->ipv6cp.fsm.state > ST_CLOSED ||
> ncp->ipv6cp.fsm.state == ST_STARTING)
> n++;
548,551c537,539
< if (probe.ipv6_available)
< if (ncp->ipv6cp.fsm.state > ST_CLOSED ||
< ncp->ipv6cp.fsm.state == ST_STARTING)
< fsm_Close(&ncp->ipv6cp.fsm);
---
> if (ncp->ipv6cp.fsm.state > ST_CLOSED ||
> ncp->ipv6cp.fsm.state == ST_STARTING)
> fsm_Close(&ncp->ipv6cp.fsm);
560,561c548
< if (probe.ipv6_available)
< fsm2initial(&ncp->ipv6cp.fsm);
---
> fsm2initial(&ncp->ipv6cp.fsm);