Deleted Added
sdiff udiff text old ( 111888 ) new ( 122320 )
full compact
ddp_input.c (111888) ddp_input.c (122320)
1/*
2 * Copyright (c) 1990,1994 Regents of The University of Michigan.
3 * All Rights Reserved. See COPYRIGHT.
4 *
1/*
2 * Copyright (c) 1990,1994 Regents of The University of Michigan.
3 * All Rights Reserved. See COPYRIGHT.
4 *
5 * $FreeBSD: head/sys/netatalk/ddp_input.c 111888 2003-03-04 23:19:55Z jlemon $
5 * $FreeBSD: head/sys/netatalk/ddp_input.c 122320 2003-11-08 22:28:40Z sam $
6 */
7
8#include "opt_mac.h"
9
10#include <sys/param.h>
11#include <sys/kernel.h>
12#include <sys/lock.h>
13#include <sys/mac.h>

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

34static void ddp_input(struct mbuf *, struct ifnet *, struct elaphdr *, int);
35
36/*
37 * Could probably merge these two code segments a little better...
38 */
39void
40at2intr(struct mbuf *m)
41{
6 */
7
8#include "opt_mac.h"
9
10#include <sys/param.h>
11#include <sys/kernel.h>
12#include <sys/lock.h>
13#include <sys/mac.h>

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

34static void ddp_input(struct mbuf *, struct ifnet *, struct elaphdr *, int);
35
36/*
37 * Could probably merge these two code segments a little better...
38 */
39void
40at2intr(struct mbuf *m)
41{
42 GIANT_REQUIRED;
42
43 /*
44 * Phase 2 packet handling
45 */
46 ddp_input(m, m->m_pkthdr.rcvif, NULL, 2);
47 return;
48}
49

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

61 }
62
63 /*
64 * This seems a little dubious, but I don't know phase 1 so leave it.
65 */
66 elhp = mtod(m, struct elaphdr *);
67 m_adj(m, SZ_ELAPHDR);
68
43
44 /*
45 * Phase 2 packet handling
46 */
47 ddp_input(m, m->m_pkthdr.rcvif, NULL, 2);
48 return;
49}
50

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

62 }
63
64 /*
65 * This seems a little dubious, but I don't know phase 1 so leave it.
66 */
67 elhp = mtod(m, struct elaphdr *);
68 m_adj(m, SZ_ELAPHDR);
69
70 GIANT_REQUIRED;
71
69 if (elhp->el_type == ELAP_DDPEXTEND) {
70 ddp_input(m, m->m_pkthdr.rcvif, NULL, 1);
71 } else {
72 bcopy((caddr_t)elhp, (caddr_t)&elh, SZ_ELAPHDR);
73 ddp_input(m, m->m_pkthdr.rcvif, &elh, 1);
74 }
75 return;
76}

--- 374 unchanged lines hidden --- 		72 if (elhp->el_type == ELAP_DDPEXTEND) {
73 ddp_input(m, m->m_pkthdr.rcvif, NULL, 1);
74 } else {
75 bcopy((caddr_t)elhp, (caddr_t)&elh, SZ_ELAPHDR);
76 ddp_input(m, m->m_pkthdr.rcvif, &elh, 1);
77 }
78 return;
79}

--- 374 unchanged lines hidden ---