Module Name: src
Committed By: christos
Date: Tue Feb 5 18:15:04 UTC 2013
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
cache the pipe before the container is put in the free list (and can change)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.19 src/sys/dev/usb/if_urtwn.c:1.20
--- src/sys/dev/usb/if_urtwn.c:1.19 Mon Jan 28 18:46:33 2013
+++ src/sys/dev/usb/if_urtwn.c Tue Feb 5 13:15:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.19 2013/01/28 23:46:33 christos Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.20 2013/02/05 18:15:04 christos Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.19 2013/01/28 23:46:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.20 2013/02/05 18:15:04 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2117,6 +2117,7 @@ urtwn_txeof(usbd_xfer_handle xfer, usbd_
struct urtwn_tx_data *data = priv;
struct urtwn_softc *sc = data->sc;
struct ifnet *ifp = &sc->sc_if;
+ usbd_pipe_handle pipe = data->pipe;
int s;
DPRINTFN(DBG_FN|DBG_TX, ("%s: %s: status=%d\n",
@@ -2135,7 +2136,7 @@ urtwn_txeof(usbd_xfer_handle xfer, usbd_
if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
if (status != USBD_NOT_STARTED && status != USBD_CANCELLED) {
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall_async(data->pipe);
+ usbd_clear_endpoint_stall_async(pipe);
ifp->if_oerrors++;
}
splx(s);
