1c1
< /* $FreeBSD: head/sys/netinet/ip_encap.c 95023 2002-04-19 04:46:24Z suz $ */
---
> /* $FreeBSD: head/sys/netinet/ip_encap.c 105194 2002-10-16 01:54:46Z sam $ */
488,491c488
< #if 0
< m->m_pkthdr.aux = ep->arg;
< #else
< struct mbuf *n;
---
> struct m_tag *tag;
493,496c490,493
< n = m_aux_add(m, AF_INET, IPPROTO_IPV4);
< if (n) {
< *mtod(n, void **) = ep->arg;
< n->m_len = sizeof(void *);
---
> tag = m_tag_get(PACKET_TAG_ENCAP, sizeof (void*), M_NOWAIT);
> if (tag) {
> *(void**)(tag+1) = ep->arg;
> m_tag_prepend(m, tag);
498d494
< #endif
505,511c501,502
< void *p;
< #if 0
< p = m->m_pkthdr.aux;
< m->m_pkthdr.aux = NULL;
< return p;
< #else
< struct mbuf *n;
---
> void *p = NULL;
> struct m_tag *tag;
513,518c504,507
< p = NULL;
< n = m_aux_find(m, AF_INET, IPPROTO_IPV4);
< if (n) {
< if (n->m_len == sizeof(void *))
< p = *mtod(n, void **);
< m_aux_delete(m, n);
---
> tag = m_tag_find(m, PACKET_TAG_ENCAP, NULL);
> if (tag) {
> p = *(void**)(tag+1);
> m_tag_delete(m, tag);
521d509
< #endif