20c20
< __FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_run.c 228494 2011-12-14 08:52:27Z hselasky $");
---
> __FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_run.c 228508 2011-12-14 22:14:05Z hselasky $");
2752c2752,2753
< if (m->m_pkthdr.len > RUN_MAX_TXSZ) {
---
> if ((m->m_pkthdr.len +
> sizeof(data->desc) + 3 + 8) > RUN_MAX_TXSZ) {
2766a2768,2775
> size += m->m_pkthdr.len;
> /*
> * Align end on a 4-byte boundary, pad 8 bytes (CRC +
> * 4-byte padding), and be sure to zero those trailing
> * bytes:
> */
> usbd_frame_zero(pc, size, ((-size) & 3) + 8);
> size += ((-size) & 3) + 8;
2785,2786c2794,2795
< DPRINTFN(11, "sending frame len=%u @ index %d\n",
< m->m_pkthdr.len, index);
---
> DPRINTFN(11, "sending frame len=%u/%u @ index %d\n",
> m->m_pkthdr.len, size, index);
2788c2797
< usbd_xfer_set_frame_len(xfer, 0, size + m->m_pkthdr.len);
---
> usbd_xfer_set_frame_len(xfer, 0, size);
2877d2885
< static const uint8_t ztail[16];
2934,2940d2941
<
< /*
< * Align end on a 4-byte boundary, pad 8 bytes (CRC + 4-byte padding),
< * and be sure to zero those trailing bytes.
< */
< m_append(m, ((m->m_pkthdr.len + 3) & ~3) - m->m_pkthdr.len + 8,
< (c_caddr_t)ztail);