Deleted Added
full compact
if_ethersubr.c (153640) if_ethersubr.c (154518)
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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)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

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
30 * $FreeBSD: head/sys/net/if_ethersubr.c 153640 2005-12-22 12:16:20Z oleg $
30 * $FreeBSD: head/sys/net/if_ethersubr.c 154518 2006-01-18 14:24:39Z andre $
31 */
32
33#include "opt_atalk.h"
34#include "opt_inet.h"
35#include "opt_inet6.h"
36#include "opt_ipx.h"
37#include "opt_mac.h"
38#include "opt_netgraph.h"

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

736 }
737
738 /* Reset layer specific mbuf flags to avoid confusing upper layers. */
739 m->m_flags &= ~(M_PROTOFLAGS);
740
741 switch (ether_type) {
742#ifdef INET
743 case ETHERTYPE_IP:
31 */
32
33#include "opt_atalk.h"
34#include "opt_inet.h"
35#include "opt_inet6.h"
36#include "opt_ipx.h"
37#include "opt_mac.h"
38#include "opt_netgraph.h"

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

736 }
737
738 /* Reset layer specific mbuf flags to avoid confusing upper layers. */
739 m->m_flags &= ~(M_PROTOFLAGS);
740
741 switch (ether_type) {
742#ifdef INET
743 case ETHERTYPE_IP:
744 if (ip_fastforward(m))
744 if ((m = ip_fastforward(m)) == NULL)
745 return;
746 isr = NETISR_IP;
747 break;
748
749 case ETHERTYPE_ARP:
750 if (ifp->if_flags & IFF_NOARP) {
751 /* Discard packet if ARP is disabled on interface */
752 m_freem(m);

--- 435 unchanged lines hidden ---
745 return;
746 isr = NETISR_IP;
747 break;
748
749 case ETHERTYPE_ARP:
750 if (ifp->if_flags & IFF_NOARP) {
751 /* Discard packet if ARP is disabled on interface */
752 m_freem(m);

--- 435 unchanged lines hidden ---