forgot to merge this bit from p4
This commit is contained in:
parent
2f4dcc2b3d
commit
698438f28b
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user