2c2
< * Synchronous PPP/Cisco link level subroutines.
---
> * Synchronous PPP/Cisco/Frame Relay link level subroutines.
5c5
< * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
---
> * Copyright (C) 1994-2000 Cronyx Engineering.
20c20
< * $FreeBSD: head/sys/net/if_spppsubr.c 138855 2004-12-14 18:18:54Z rik $
---
> * $FreeBSD: head/sys/net/if_spppsubr.c 139365 2004-12-28 00:07:57Z rik $
412,413d411
< static void sppp_get_ip_addrs(struct sppp *sp, u_long *src, u_long *dst,
< u_long *srcmask);
553a552,557
> if (sp->pp_mode == PP_FR) {
> sppp_fr_input (sp, m);
> SPPP_UNLOCK(sp);
> return;
> }
>
890c894
< if (sp->pp_mode != IFF_CISCO &&
---
> if (sp->pp_mode != IFF_CISCO && sp->pp_mode != PP_FR &&
917a922,929
> if (sp->pp_mode == PP_FR) {
> /* Add frame relay header. */
> m = sppp_fr_header (sp, m, dst->sa_family);
> if (! m)
> goto nobufs;
> goto out;
> }
>
923c935
< if (debug)
---
> nobufs: if (debug)
1002a1015
> out:
1165c1178,1179
< (sppp_ncp_check(sp) || sp->pp_mode == IFF_CISCO)) {
---
> (sppp_ncp_check(sp) || sp->pp_mode == IFF_CISCO ||
> sp->pp_mode == PP_FR)) {
1191c1205,1206
< sp->pp_mode == IFF_CISCO))
---
> sp->pp_mode == IFF_CISCO ||
> sp->pp_mode == PP_FR))
1235a1251,1253
> if (!newmode)
> newmode = sp->pp_flags & PP_FR;
>
1243c1261,1262
< if (sp->pp_mode != IFF_CISCO)
---
> if (sp->pp_mode != IFF_CISCO &&
> sp->pp_mode != PP_FR)
1253c1272,1273
< if (sp->pp_mode != IFF_CISCO)
---
> if (sp->pp_mode != IFF_CISCO &&
> sp->pp_mode != PP_FR)
1260c1280,1281
< if (sp->pp_mode == IFF_CISCO) {
---
> if ((sp->pp_mode == IFF_CISCO) ||
> (sp->pp_mode == PP_FR)) {
4771a4793,4797
> if (sp->pp_mode == PP_FR) {
> sppp_fr_keepalive (sp);
> goto out;
> }
>
4811c4837
< static void
---
> void