Deleted Added
full compact
if_spppsubr.c (11189) if_spppsubr.c (11819)
1/*
2 * Synchronous PPP/Cisco link level subroutines.
3 * Keepalive protocol implemented in both Cisco and PPP modes.
4 *
5 * Copyright (C) 1994 Cronyx Ltd.
6 * Author: Serge Vakulenko, <vak@zebub.msk.su>
7 *
8 * This software is distributed with NO WARRANTIES, not even the implied

--- 22 unchanged lines hidden (view full) ---

31#include <netinet/in.h>
32#include <netinet/in_systm.h>
33#include <netinet/in_var.h>
34#include <netinet/ip.h>
35#include <netinet/tcp.h>
36#include <netinet/if_ether.h>
37#endif
38
1/*
2 * Synchronous PPP/Cisco link level subroutines.
3 * Keepalive protocol implemented in both Cisco and PPP modes.
4 *
5 * Copyright (C) 1994 Cronyx Ltd.
6 * Author: Serge Vakulenko, <vak@zebub.msk.su>
7 *
8 * This software is distributed with NO WARRANTIES, not even the implied

--- 22 unchanged lines hidden (view full) ---

31#include <netinet/in.h>
32#include <netinet/in_systm.h>
33#include <netinet/in_var.h>
34#include <netinet/ip.h>
35#include <netinet/tcp.h>
36#include <netinet/if_ether.h>
37#endif
38
39#ifdef IPX
40#include <netipx/ipx.h>
41#include <netipx/ipx_if.h>
42#endif
43
39#ifdef NS
40#include <netns/ns.h>
41#include <netns/ns_if.h>
42#endif
43
44#ifdef ISO
45#include <netiso/argo_debug.h>
46#include <netiso/iso.h>

--- 353 unchanged lines hidden (view full) ---

400 break;
401#endif
402#ifdef NS
403 case AF_NS: /* Xerox NS Protocol */
404 h->protocol = htons ((sp->pp_flags & PP_CISCO) ?
405 ETHERTYPE_NS : PPP_XNS);
406 break;
407#endif
44#ifdef NS
45#include <netns/ns.h>
46#include <netns/ns_if.h>
47#endif
48
49#ifdef ISO
50#include <netiso/argo_debug.h>
51#include <netiso/iso.h>

--- 353 unchanged lines hidden (view full) ---

405 break;
406#endif
407#ifdef NS
408 case AF_NS: /* Xerox NS Protocol */
409 h->protocol = htons ((sp->pp_flags & PP_CISCO) ?
410 ETHERTYPE_NS : PPP_XNS);
411 break;
412#endif
413#ifdef IPX
414 case AF_IPX: /* Xerox NS Protocol */
415 h->protocol = htons ((sp->pp_flags & PP_CISCO) ?
416 ETHERTYPE_IPX : PPP_XNS);
417 break;
418#endif
408#ifdef ISO
409 case AF_ISO: /* ISO OSI Protocol */
410 if (sp->pp_flags & PP_CISCO)
411 goto nosupport;
412 h->protocol = htons (PPP_ISO);
413 break;
414#endif
415nosupport:

--- 911 unchanged lines hidden ---
419#ifdef ISO
420 case AF_ISO: /* ISO OSI Protocol */
421 if (sp->pp_flags & PP_CISCO)
422 goto nosupport;
423 h->protocol = htons (PPP_ISO);
424 break;
425#endif
426nosupport:

--- 911 unchanged lines hidden ---