forgot to merge this bit from p4

This commit is contained in:
sam 2005-03-29 21:06:28 +00:00
parent 2f4dcc2b3d
commit 698438f28b

View File

@ -2925,7 +2925,8 @@ ath_defrag(struct mbuf *m0, int how, int maxfrags)
n = m->m_next;
if (n == NULL)
break;
if (n->m_len < M_TRAILINGSPACE(m)) {
if ((m->m_flags & M_RDONLY) == 0 &&
n->m_len < M_TRAILINGSPACE(m)) {
bcopy(mtod(n, void *), mtod(m, char *) + m->m_len,
n->m_len);
m->m_len += n->m_len;