Sync with recent KAME.

This work was based on kame-20010528-freebsd43-snap.tgz and some
critical problem after the snap was out were fixed.
There are many many changes since last KAME merge.

TODO:
  - The definitions of SADB_* in sys/net/pfkeyv2.h are still different
    from RFC2407/IANA assignment because of binary compatibility
    issue.  It should be fixed under 5-CURRENT.
  - ip6po_m member of struct ip6_pktopts is no longer used.  But, it
    is still there because of binary compatibility issue.  It should
    be removed under 5-CURRENT.

Reviewed by:	itojun
Obtained from:	KAME
MFC after:	3 weeks

1 files changed, 0 insertions, 9 deletions

diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index df9db28..b30975b 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -570,15 +570,6 @@ m_freem(struct mbuf *m)
 	if (m == NULL)
 		return;
 	do {
-		/*
-		 * we do need to check non-first mbuf, since some of existing
-		 * code does not call M_PREPEND properly.
-		 * (example: call to bpf_mtap from drivers)
-		 */
-		if ((m->m_flags & M_PKTHDR) != 0 && m->m_pkthdr.aux) {
-			m_freem(m->m_pkthdr.aux);
-			m->m_pkthdr.aux = NULL;
-		}
 		MFREE(m, n);
 		m = n;
 	} while (m);