Deleted Added
full compact
if_fddisubr.c (43305) if_fddisubr.c (48645)
1/*
2 * Copyright (c) 1995, 1996
3 * Matt Thomas <matt@3am-software.com>. All rights reserved.
4 * Copyright (c) 1982, 1989, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
1/*
2 * Copyright (c) 1995, 1996
3 * Matt Thomas <matt@3am-software.com>. All rights reserved.
4 * Copyright (c) 1982, 1989, 1993
5 * The Regents of the University of California. All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
36 * $Id: if_fddisubr.c,v 1.33 1998/06/21 14:53:23 bde Exp $
36 * $Id: if_fddisubr.c,v 1.34 1999/01/27 22:42:13 dillon Exp $
37 */
38
39#include "opt_atalk.h"
40#include "opt_inet.h"
41#include "opt_ipx.h"
42
43#include <sys/param.h>
44#include <sys/systm.h>

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

100extern u_char at_org_code[ 3 ];
101extern u_char aarp_org_code[ 3 ];
102#endif /* NETATALK */
103
104#if defined(LLC) && defined(CCITT)
105extern struct ifqueue pkintrq;
106#endif
107
37 */
38
39#include "opt_atalk.h"
40#include "opt_inet.h"
41#include "opt_ipx.h"
42
43#include <sys/param.h>
44#include <sys/systm.h>

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

100extern u_char at_org_code[ 3 ];
101extern u_char aarp_org_code[ 3 ];
102#endif /* NETATALK */
103
104#if defined(LLC) && defined(CCITT)
105extern struct ifqueue pkintrq;
106#endif
107
108#include "bpfilter.h"
108#include "bpf.h"
109
110#define senderr(e) { error = (e); goto bad;}
111
112/*
113 * This really should be defined in if_llc.h but in case it isn't.
114 */
115#ifndef llc_snap
116#define llc_snap llc_un.type_snap

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

304 eh = (struct ether_header *)dst->sa_data;
305 (void)memcpy((caddr_t)edst, (caddr_t)eh->ether_dhost, sizeof (edst));
306 if (*edst & 1)
307 m->m_flags |= (M_BCAST|M_MCAST);
308 type = eh->ether_type;
309 break;
310 }
311
109
110#define senderr(e) { error = (e); goto bad;}
111
112/*
113 * This really should be defined in if_llc.h but in case it isn't.
114 */
115#ifndef llc_snap
116#define llc_snap llc_un.type_snap

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

304 eh = (struct ether_header *)dst->sa_data;
305 (void)memcpy((caddr_t)edst, (caddr_t)eh->ether_dhost, sizeof (edst));
306 if (*edst & 1)
307 m->m_flags |= (M_BCAST|M_MCAST);
308 type = eh->ether_type;
309 break;
310 }
311
312#if NBPFILTER > 0
312#if NBPF > 0
313 case AF_IMPLINK:
314 {
315 fh = mtod(m, struct fddi_header *);
316 error = EPROTONOSUPPORT;
317 switch (fh->fddi_fc & (FDDIFC_C|FDDIFC_L|FDDIFC_F)) {
318 case FDDIFC_LLC_ASYNC: {
319 /* legal priorities are 0 through 7 */
320 if ((fh->fddi_fc & FDDIFC_Z) > 7)

--- 383 unchanged lines hidden ---
313 case AF_IMPLINK:
314 {
315 fh = mtod(m, struct fddi_header *);
316 error = EPROTONOSUPPORT;
317 switch (fh->fddi_fc & (FDDIFC_C|FDDIFC_L|FDDIFC_F)) {
318 case FDDIFC_LLC_ASYNC: {
319 /* legal priorities are 0 through 7 */
320 if ((fh->fddi_fc & FDDIFC_Z) > 7)

--- 383 unchanged lines hidden ---