Deleted Added
full compact
if_ethersubr.c (121816) if_ethersubr.c (122702)
1/*
2 * Copyright (c) 1982, 1989, 1993
3 * The Regents of the University of California. 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

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

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
1/*
2 * Copyright (c) 1982, 1989, 1993
3 * The Regents of the University of California. 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

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

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
34 * $FreeBSD: head/sys/net/if_ethersubr.c 121816 2003-10-31 18:32:15Z brooks $
34 * $FreeBSD: head/sys/net/if_ethersubr.c 122702 2003-11-14 21:02:22Z andre $
35 */
36
37#include "opt_atalk.h"
38#include "opt_inet.h"
39#include "opt_inet6.h"
40#include "opt_ipx.h"
41#include "opt_bdg.h"
42#include "opt_mac.h"

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

709 if (m->m_flags & M_HASFCS) {
710 m_adj(m, -ETHER_CRC_LEN);
711 m->m_flags &= ~M_HASFCS;
712 }
713
714 switch (ether_type) {
715#ifdef INET
716 case ETHERTYPE_IP:
35 */
36
37#include "opt_atalk.h"
38#include "opt_inet.h"
39#include "opt_inet6.h"
40#include "opt_ipx.h"
41#include "opt_bdg.h"
42#include "opt_mac.h"

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

709 if (m->m_flags & M_HASFCS) {
710 m_adj(m, -ETHER_CRC_LEN);
711 m->m_flags &= ~M_HASFCS;
712 }
713
714 switch (ether_type) {
715#ifdef INET
716 case ETHERTYPE_IP:
717 if (ipflow_fastforward(m))
717 if (ip_fastforward(m))
718 return;
719 isr = NETISR_IP;
720 break;
721
722 case ETHERTYPE_ARP:
723 if (ifp->if_flags & IFF_NOARP) {
724 /* Discard packet if ARP is disabled on interface */
725 m_freem(m);

--- 314 unchanged lines hidden ---
718 return;
719 isr = NETISR_IP;
720 break;
721
722 case ETHERTYPE_ARP:
723 if (ifp->if_flags & IFF_NOARP) {
724 /* Discard packet if ARP is disabled on interface */
725 m_freem(m);

--- 314 unchanged lines hidden ---