diff options
| author |   mpi <mpi@openbsd.org> | 2018-11-10 15:28:05 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2018-11-10 15:28:05 +0000 |
| commit | 98d77b560d788a1ef05794f4b79361f523a537b5 (patch) | |
| tree | d19f8710b46951260ec8c736d782d498e5892cc3 /sys | |
| parent | Stop passing value+3 as the start time for tick_msg(). Just #define (diff) | |
| download | wireguard-openbsd-98d77b560d788a1ef05794f4b79361f523a537b5.tar.xz wireguard-openbsd-98d77b560d788a1ef05794f4b79361f523a537b5.zip | |
Pass free(9) sizes for the tx descriptors.
ok tedu@, visa@, stsp@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/if_wi_usb.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c index 6c1207eca2d..16f4f7cb587 100644 --- a/sys/dev/usb/if_wi_usb.c +++ b/sys/dev/usb/if_wi_usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_usb.c,v 1.68 2015/11/24 17:11:40 mpi Exp $ */ +/* $OpenBSD: if_wi_usb.c,v 1.69 2018/11/10 15:28:05 mpi Exp $ */ /* * Copyright (c) 2003 Dale Rahn. All rights reserved. @@ -409,9 +409,10 @@ wi_usb_detach(struct device *self, int flags) while (sc->wi_usb_nummem) { sc->wi_usb_nummem--; - if (sc->wi_usb_txmem[sc->wi_usb_nummem] != NULL) - free(sc->wi_usb_txmem[sc->wi_usb_nummem], M_DEVBUF, 0); + free(sc->wi_usb_txmem[sc->wi_usb_nummem], M_DEVBUF, + sc->wi_usb_txmemsize[sc->wi_usb_nummem]); sc->wi_usb_txmem[sc->wi_usb_nummem] = NULL; + sc->wi_usb_txmemsize[sc->wi_usb_nummem] = 0; } if (sc->wi_usb_ep[WI_USB_ENDPT_INTR] != NULL) { @@ -541,8 +542,10 @@ wi_cmd_usb(struct wi_softc *wsc, int cmd, int val0, int val1, int val2) /* free alloc_nicmem regions */ while (sc->wi_usb_nummem) { sc->wi_usb_nummem--; - free(sc->wi_usb_txmem[sc->wi_usb_nummem], M_DEVBUF, 0); + free(sc->wi_usb_txmem[sc->wi_usb_nummem], M_DEVBUF, + sc->wi_usb_txmemsize[sc->wi_usb_nummem]); sc->wi_usb_txmem[sc->wi_usb_nummem] = NULL; + sc->wi_usb_txmemsize[sc->wi_usb_nummem] = 0; } #if 0 |