| if_ethersubr.c (253590) | if_ethersubr.c (254523) |
|---|---|
| 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 253590 2013-07-24 04:24:21Z marcel $ | 30 * $FreeBSD: head/sys/net/if_ethersubr.c 254523 2013-08-19 13:27:32Z 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_netgraph.h" 38#include "opt_mbuf_profiling.h" --- 730 unchanged lines hidden (view full) --- 769 return; 770 } 771 772 /* 773 * Reset layer specific mbuf flags to avoid confusing upper layers. 774 * Strip off Ethernet header. 775 */ 776 m->m_flags &= ~M_VLANTAG; | 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_netgraph.h" 38#include "opt_mbuf_profiling.h" --- 730 unchanged lines hidden (view full) --- 769 return; 770 } 771 772 /* 773 * Reset layer specific mbuf flags to avoid confusing upper layers. 774 * Strip off Ethernet header. 775 */ 776 m->m_flags &= ~M_VLANTAG; |
| 777 m->m_flags &= ~(M_PROTOFLAGS); | 777 m_clrprotoflags(m); |
| 778 m_adj(m, ETHER_HDR_LEN); 779 780 /* 781 * Dispatch frame to upper layer. 782 */ 783 switch (ether_type) { 784#ifdef INET 785 case ETHERTYPE_IP: --- 536 unchanged lines hidden --- | 778 m_adj(m, ETHER_HDR_LEN); 779 780 /* 781 * Dispatch frame to upper layer. 782 */ 783 switch (ether_type) { 784#ifdef INET 785 case ETHERTYPE_IP: --- 536 unchanged lines hidden --- |