Page MenuHomeFreeBSD
Files F152016672

D3988.id9662.diff
No OneTemporary
Actions

D3988.id9662.diff
View Options

Index: sys/dev/usb/wlan/if_urtwn.c
===================================================================
--- sys/dev/usb/wlan/if_urtwn.c
+++ sys/dev/usb/wlan/if_urtwn.c
@@ -183,7 +183,8 @@
int *);
static struct mbuf * urtwn_rxeof(struct usb_xfer *, struct urtwn_data *,
int *, int8_t *);
-static void urtwn_txeof(struct usb_xfer *, struct urtwn_data *);
+static void urtwn_txeof(struct urtwn_softc *, struct urtwn_data *,
+ int);
static int urtwn_alloc_list(struct urtwn_softc *,
struct urtwn_data[], int, int);
static int urtwn_alloc_rx_list(struct urtwn_softc *);
@@ -831,16 +832,19 @@
}
static void
-urtwn_txeof(struct usb_xfer *xfer, struct urtwn_data *data)
+urtwn_txeof(struct urtwn_softc *sc, struct urtwn_data *data, int status)
{
- struct urtwn_softc *sc = usbd_xfer_softc(xfer);
URTWN_ASSERT_LOCKED(sc);
- /* XXX status? */
- ieee80211_tx_complete(data->ni, data->m, 0);
+
+ ieee80211_tx_complete(data->ni, data->m, status);
+
data->ni = NULL;
data->m = NULL;
+
sc->sc_txtimer = 0;
+
+ STAILQ_INSERT_TAIL(&sc->sc_tx_inactive, data, next);
}
static int
@@ -953,8 +957,7 @@
if (data == NULL)
goto tr_setup;
STAILQ_REMOVE_HEAD(&sc->sc_tx_active, next);
- urtwn_txeof(xfer, data);
- STAILQ_INSERT_TAIL(&sc->sc_tx_inactive, data, next);
+ urtwn_txeof(sc, data, 0);
/* FALLTHROUGH */
case USB_ST_SETUP:
tr_setup:
@@ -972,12 +975,8 @@
data = STAILQ_FIRST(&sc->sc_tx_active);
if (data == NULL)
goto tr_setup;
- if (data->ni != NULL) {
- if_inc_counter(data->ni->ni_vap->iv_ifp,
- IFCOUNTER_OERRORS, 1);
- ieee80211_free_node(data->ni);
- data->ni = NULL;
- }
+ STAILQ_REMOVE_HEAD(&sc->sc_tx_active, next);
+ urtwn_txeof(sc, data, 1);
if (error != USB_ERR_CANCELLED) {
usbd_xfer_set_stall(xfer);
goto tr_setup;

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 13, 3:02 AM (17 h, 40 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31390866
Default Alt Text
D3988.id9662.diff (1 KB)

Event Timeline