Deleted Added
full compact
if_spppfr.c (263140) if_spppfr.c (263152)
1/*-
2 * Synchronous Frame Relay link level subroutines.
3 * ANSI T1.617-compaible link management signaling
4 * implemented for Frame Relay mode.
5 * Cisco-type Frame Relay framing added, thanks Alex Tutubalin.
6 * Only one DLCI per channel for now.
7 *
8 * Copyright (C) 1994-2000 Cronyx Engineering.

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

15 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
16 *
17 * Authors grant any other persons or organisations a permission to use,
18 * modify and redistribute this software in source and binary forms,
19 * as long as this message is kept with the software, all derivative
20 * works or modified versions.
21 *
22 * $Cronyx Id: if_spppfr.c,v 1.1.2.10 2004/06/29 09:02:30 rik Exp $
1/*-
2 * Synchronous Frame Relay link level subroutines.
3 * ANSI T1.617-compaible link management signaling
4 * implemented for Frame Relay mode.
5 * Cisco-type Frame Relay framing added, thanks Alex Tutubalin.
6 * Only one DLCI per channel for now.
7 *
8 * Copyright (C) 1994-2000 Cronyx Engineering.

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

15 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
16 *
17 * Authors grant any other persons or organisations a permission to use,
18 * modify and redistribute this software in source and binary forms,
19 * as long as this message is kept with the software, all derivative
20 * works or modified versions.
21 *
22 * $Cronyx Id: if_spppfr.c,v 1.1.2.10 2004/06/29 09:02:30 rik Exp $
23 * $FreeBSD: head/sys/net/if_spppfr.c 263140 2014-03-14 02:58:48Z glebius $
23 * $FreeBSD: head/sys/net/if_spppfr.c 263152 2014-03-14 06:29:43Z glebius $
24 */
25
26#include <sys/param.h>
27
28#if defined(__FreeBSD__)
29#include "opt_inet.h"
30#include "opt_inet6.h"
31#endif

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

255 ++ifp->if_iqdrops;
256 m_freem (m);
257 return;
258#ifdef INET
259 case ETHERTYPE_IP:
260 isr = NETISR_IP;
261 break;
262#endif
24 */
25
26#include <sys/param.h>
27
28#if defined(__FreeBSD__)
29#include "opt_inet.h"
30#include "opt_inet6.h"
31#endif

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

255 ++ifp->if_iqdrops;
256 m_freem (m);
257 return;
258#ifdef INET
259 case ETHERTYPE_IP:
260 isr = NETISR_IP;
261 break;
262#endif
263#ifdef NETATALK
264 case ETHERTYPE_AT:
265 isr = NETISR_ATALK;
266 break;
267#endif
268 }
269
270 if (! (ifp->if_flags & IFF_UP))
271 goto drop;
272
273 M_SETFIB(m, ifp->if_fib);
274
275 /* Check queue. */

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

334 h[3] = FR_IP;
335 return m;
336#endif
337#ifdef NS
338 case AF_NS:
339 type = 0x8137;
340 break;
341#endif
263 }
264
265 if (! (ifp->if_flags & IFF_UP))
266 goto drop;
267
268 M_SETFIB(m, ifp->if_fib);
269
270 /* Check queue. */

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

329 h[3] = FR_IP;
330 return m;
331#endif
332#ifdef NS
333 case AF_NS:
334 type = 0x8137;
335 break;
336#endif
342#ifdef NETATALK
343 case AF_APPLETALK:
344 type = ETHERTYPE_AT;
345 break;
346#endif
347 }
348 h[3] = FR_PADDING;
349 h[4] = FR_SNAP;
350 h[5] = 0;
351 h[6] = 0;
352 h[7] = 0;
353 *(short*) (h+8) = htons(type);
354 return m;

--- 267 unchanged lines hidden ---
337 }
338 h[3] = FR_PADDING;
339 h[4] = FR_SNAP;
340 h[5] = 0;
341 h[6] = 0;
342 h[7] = 0;
343 *(short*) (h+8) = htons(type);
344 return m;

--- 267 unchanged lines hidden ---