Deleted Added
full compact
if_ef.c (122702) if_ef.c (123922)
1/*-
2 * Copyright (c) 1999, 2000 Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1999, 2000 Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/net/if_ef.c 122702 2003-11-14 21:02:22Z andre $
26 * $FreeBSD: head/sys/net/if_ef.c 123922 2003-12-28 03:56:00Z sam $
27 */
28
29#include "opt_inet.h"
30#include "opt_ipx.h"
31#include "opt_ef.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>

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

367 return EPROTONOSUPPORT;
368 }
369 eifp = &efp->ef_ac.ac_if;
370 if ((eifp->if_flags & IFF_UP) == 0)
371 return EPROTONOSUPPORT;
372 eifp->if_ibytes += m->m_pkthdr.len + sizeof (*eh);
373 m->m_pkthdr.rcvif = eifp;
374
27 */
28
29#include "opt_inet.h"
30#include "opt_ipx.h"
31#include "opt_ef.h"
32
33#include <sys/param.h>
34#include <sys/systm.h>

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

367 return EPROTONOSUPPORT;
368 }
369 eifp = &efp->ef_ac.ac_if;
370 if ((eifp->if_flags & IFF_UP) == 0)
371 return EPROTONOSUPPORT;
372 eifp->if_ibytes += m->m_pkthdr.len + sizeof (*eh);
373 m->m_pkthdr.rcvif = eifp;
374
375 if (eifp->if_bpf) {
376 struct mbuf m0;
377 m0.m_next = m;
378 m0.m_len = ETHER_HDR_LEN;
379 m0.m_data = (char *)eh;
380 BPF_MTAP(eifp, &m0);
381 }
375 BPF_MTAP2(eifp, eh, ETHER_HDR_LEN, m);
382 /*
383 * Now we ready to adjust mbufs and pass them to protocol intr's
384 */
385 switch(ft) {
386 case ETHER_FT_EII:
387 return (ef_inputEII(m, eh, ether_type));
388#ifdef IPX
389 case ETHER_FT_8023: /* only IPX can be here */

--- 212 unchanged lines hidden ---
376 /*
377 * Now we ready to adjust mbufs and pass them to protocol intr's
378 */
379 switch(ft) {
380 case ETHER_FT_EII:
381 return (ef_inputEII(m, eh, ether_type));
382#ifdef IPX
383 case ETHER_FT_8023: /* only IPX can be here */

--- 212 unchanged lines hidden ---