Deleted Added
full compact
if_fddisubr.c (121436) if_fddisubr.c (122702)
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 * $FreeBSD: head/sys/net/if_fddisubr.c 121436 2003-10-23 17:47:55Z imp $
36 * $FreeBSD: head/sys/net/if_fddisubr.c 122702 2003-11-14 21:02:22Z andre $
37 */
38
39#include "opt_atalk.h"
40#include "opt_inet.h"
41#include "opt_inet6.h"
42#include "opt_ipx.h"
43#include "opt_mac.h"
44

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

466 }
467
468 type = ntohs(l->llc_snap.ether_type);
469 m_adj(m, LLC_SNAPFRAMELEN);
470
471 switch (type) {
472#ifdef INET
473 case ETHERTYPE_IP:
37 */
38
39#include "opt_atalk.h"
40#include "opt_inet.h"
41#include "opt_inet6.h"
42#include "opt_ipx.h"
43#include "opt_mac.h"
44

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

466 }
467
468 type = ntohs(l->llc_snap.ether_type);
469 m_adj(m, LLC_SNAPFRAMELEN);
470
471 switch (type) {
472#ifdef INET
473 case ETHERTYPE_IP:
474 if (ipflow_fastforward(m))
474 if (ip_fastforward(m))
475 return;
476 isr = NETISR_IP;
477 break;
478
479 case ETHERTYPE_ARP:
480 if (ifp->if_flags & IFF_NOARP)
481 goto dropanyway;
482 isr = NETISR_ARP;

--- 280 unchanged lines hidden ---
475 return;
476 isr = NETISR_IP;
477 break;
478
479 case ETHERTYPE_ARP:
480 if (ifp->if_flags & IFF_NOARP)
481 goto dropanyway;
482 isr = NETISR_ARP;

--- 280 unchanged lines hidden ---