Deleted Added
full compact
2c2
< /* $FreeBSD: head/sys/dev/usb/wlan/if_upgt.c 243857 2012-12-04 09:32:43Z glebius $ */
---
> /* $FreeBSD: head/sys/dev/usb/wlan/if_upgt.c 244503 2012-12-20 18:38:02Z hselasky $ */
204c204
< .bufsize = MCLBYTES,
---
> .bufsize = MCLBYTES * UPGT_TX_MAXCOUNT,
206d205
< .ext_buffer = 1,
217c216
< .bufsize = MCLBYTES,
---
> .bufsize = MCLBYTES * UPGT_RX_MAXCOUNT,
219d217
< .ext_buffer = 1,
279a278,282
> sc->sc_rx_dma_buf = usbd_xfer_get_frame_buffer(
> sc->sc_xfer[UPGT_BULK_RX], 0);
> sc->sc_tx_dma_buf = usbd_xfer_get_frame_buffer(
> sc->sc_xfer[UPGT_BULK_TX], 0);
>
1955,1961c1958
<
< data->buf = malloc(MCLBYTES, M_USBDEV, M_NOWAIT | M_ZERO);
< if (data->buf == NULL) {
< device_printf(sc->sc_dev,
< "could not allocate TX buffer\n");
< return (ENOMEM);
< }
---
> data->buf = ((uint8_t *)sc->sc_tx_dma_buf) + (i * MCLBYTES);
1979,1985c1976
<
< data->buf = malloc(MCLBYTES, M_USBDEV, M_NOWAIT | M_ZERO);
< if (data->buf == NULL) {
< device_printf(sc->sc_dev,
< "could not allocate RX buffer\n");
< return (ENOMEM);
< }
---
> data->buf = ((uint8_t *)sc->sc_rx_dma_buf) + (i * MCLBYTES);
2007d1997
< usbd_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS);
2008a1999,2001
>
> usbd_transfer_unsetup(sc->sc_xfer, UPGT_N_XFERS);
>
2026c2019
< free(data->buf, M_USBDEV);
---
> data->buf = NULL;
2039c2032
< free(data->buf, M_USBDEV);
---
> data->buf = NULL;
2281,2282c2274
< usbd_xfer_set_frame_data(xfer, 0, data->buf,
< usbd_xfer_max_len(xfer));
---
> usbd_xfer_set_frame_data(xfer, 0, data->buf, MCLBYTES);
2385,2386c2377
<
< { 0, 0 }
---
> DEVMETHOD_END