D37510.id113722.diff
No OneTemporary
Actions

Size

879 B

Referenced Files

None

Subscribers

None

D37510.id113722.diff
View Options

	diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
	--- a/sys/net/if_ethersubr.c
	+++ b/sys/net/if_ethersubr.c
	@@ -890,11 +890,9 @@

	/*
	* Reset layer specific mbuf flags to avoid confusing upper layers.
	- * Strip off Ethernet header.
	*/
	m->m_flags &= ~M_VLANTAG;
	m_clrprotoflags(m);
	- m_adj(m, ETHER_HDR_LEN);

	/*
	* Dispatch frame to upper layer.
	@@ -922,6 +920,10 @@
	default:
	goto discard;
	}
	+
	+ /* Strip off Ethernet header. */
	+ m_adj(m, ETHER_HDR_LEN);
	+
	netisr_dispatch(isr, m);
	return;

	@@ -934,11 +936,6 @@
	if (ifp->if_l2com != NULL) {
	KASSERT(ng_ether_input_orphan_p != NULL,
	("ng_ether_input_orphan_p is NULL"));
	- /*
	- * Put back the ethernet header so netgraph has a
	- * consistent view of inbound packets.
	- */
	- M_PREPEND(m, ETHER_HDR_LEN, M_NOWAIT);
	(*ng_ether_input_orphan_p)(ifp, m);
	return;
	}