Changeset 3636

Timestamp:

05/16/08 18:21:26 (3 months ago)

Author:

benoit

Message:

Consistent check of value returned by ath_hal_setuptxqueue().

Files:

• madwifi/branches/madwifi-dfs/ath/if_ath.c (modified) (4 diffs)

madwifi/branches/madwifi-dfs/ath/if_ath.c

@@ -4890 +4890 @@
-        /* NB: don't enable any interrupts */
-        qnum = ath_hal_setuptxqueue(sc->sc_ah, HAL_TX_QUEUE_BEACON, &qi);
+        if (qnum < 0)
+                return -1;
+        if (qnum >= ARRAY_SIZE(sc->sc_txq)) {
+                EPRINTF(sc, "HAL hardware queue number %d(>=%d) "
+                        "is out of range.\n",
+                        qnum, ARRAY_SIZE(sc->sc_txq));
+                ath_hal_releasetxqueue(sc->sc_ah, qnum);
+                return -1;
+        }
+
-        txq = &sc->sc_txq[qnum];
-        memset(txq, 0, sizeof(struct ath_txq));
@@ -7259 +7269 @@
-        if (sc->sc_grpplq.axq_qnum == -1) {
-                qnum = ath_hal_setuptxqueue(ah, qtype, &qi);
-== -1
+< 0
-                        return ;
-                if (qnum >= ARRAY_SIZE(sc->sc_txq)) {
-
-
-
-
+
+
+
-                        ath_hal_releasetxqueue(ah, qnum);
-                        return;
@@ -7615 +7624 @@
-                        HAL_TXQ_TXDESCINT_ENABLE;
-        qnum = ath_hal_setuptxqueue(ah, qtype, &qi);
-== -1
+< 0
-                /*
-                 * NB: don't print a message, this happens
@@ -7629 +7638 @@
-        }
-        if (qnum >= ARRAY_SIZE(sc->sc_txq)) {
-
-
-
-
+
+
-#ifdef ATH_SUPERG_COMP
-                if (compbuf) {