Deleted Added
full compact
if_spppsubr.c (132199) if_spppsubr.c (134391)
1/*
2 * Synchronous PPP/Cisco link level subroutines.
3 * Keepalive protocol implemented in both Cisco and PPP modes.
4 *
5 * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
6 * Author: Serge Vakulenko, <vak@cronyx.ru>
7 *
8 * Heavily revamped to conform to RFC 1661.
9 * Copyright (C) 1997, 2001 Joerg Wunsch.
10 *
11 * This software is distributed with NO WARRANTIES, not even the implied
12 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13 *
14 * Authors grant any other persons or organisations permission to use
15 * or modify this software as long as this message is kept with the software,
16 * all derivative works or modified versions.
17 *
18 * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
19 *
1/*
2 * Synchronous PPP/Cisco link level subroutines.
3 * Keepalive protocol implemented in both Cisco and PPP modes.
4 *
5 * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
6 * Author: Serge Vakulenko, <vak@cronyx.ru>
7 *
8 * Heavily revamped to conform to RFC 1661.
9 * Copyright (C) 1997, 2001 Joerg Wunsch.
10 *
11 * This software is distributed with NO WARRANTIES, not even the implied
12 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13 *
14 * Authors grant any other persons or organisations permission to use
15 * or modify this software as long as this message is kept with the software,
16 * all derivative works or modified versions.
17 *
18 * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
19 *
20 * $FreeBSD: head/sys/net/if_spppsubr.c 132199 2004-07-15 08:26:07Z phk $
20 * $FreeBSD: head/sys/net/if_spppsubr.c 134391 2004-08-27 18:33:08Z andre $
21 */
22
23#include <sys/param.h>
24
25#if defined(__FreeBSD__) && __FreeBSD__ >= 3
26#include "opt_inet.h"
27#include "opt_inet6.h"
28#include "opt_ipx.h"

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

710 h->address, h->control, ntohs(h->protocol));
711 goto drop;
712 }
713
714 if (! (ifp->if_flags & IFF_UP) || isr == -1)
715 goto drop;
716
717 /* Check queue. */
21 */
22
23#include <sys/param.h>
24
25#if defined(__FreeBSD__) && __FreeBSD__ >= 3
26#include "opt_inet.h"
27#include "opt_inet6.h"
28#include "opt_ipx.h"

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

710 h->address, h->control, ntohs(h->protocol));
711 goto drop;
712 }
713
714 if (! (ifp->if_flags & IFF_UP) || isr == -1)
715 goto drop;
716
717 /* Check queue. */
718 if (! netisr_queue(isr, m)) {
718 if (netisr_queue(isr, m)) { /* (0) on success. */
719 if (debug)
720 log(LOG_DEBUG, SPP_FMT "protocol queue overflow\n",
721 SPP_ARGS(ifp));
722 goto drop2;
723 }
724 if (do_account)
725 /*
726 * Do only account for network packets, not for control

--- 4605 unchanged lines hidden ---
719 if (debug)
720 log(LOG_DEBUG, SPP_FMT "protocol queue overflow\n",
721 SPP_ARGS(ifp));
722 goto drop2;
723 }
724 if (do_account)
725 /*
726 * Do only account for network packets, not for control

--- 4605 unchanged lines hidden ---