Ticket #925: newhalbsd.patch

ath/if_athvar.h

@@ -894 +894 @@
-        ath_hal_getcapability(_ah, HAL_CAP_REG_DMN, 0, (_prd))
-#define ath_hal_getcountrycode(_ah, _pcc) \
-        (*(_pcc) = (_ah)->ah_countryCode)
-        ath_hal_
+ ath_hal_has
-        (ath_hal_getcapability(_ah, HAL_CAP_TKIP_SPLIT, 0, NULL) == HAL_OK)
+#define ath_hal_gettkipsplit(_ah) \
+        (ath_hal_getcapability(_ah, HAL_CAP_TKIP_SPLIT, 1, NULL) == HAL_OK)
+#define ath_hal_settkipsplit(_ah, _v) \
+        ath_hal_setcapability(_ah, HAL_CAP_TKIP_SPLIT, 1, _v, NULL)
-#define ath_hal_wmetkipmic(_ah) \
-        (ath_hal_getcapability(_ah, HAL_CAP_WME_TKIPMIC, 0, NULL) == HAL_OK)
-#define ath_hal_hwphycounters(_ah) \

ath/if_ath.c

@@ -346 +346 @@
-} while (0)
-#define KEYPRINTF(sc, ix, hk, mac) do {                         \
-        if (sc->sc_debug & ATH_DEBUG_KEYCACHE)                  \
-__func__, ix, hk, mac);   
+sc, __func__, ix, hk, mac);
-} while (0)
-#else /* defined(AR_DEBUG) */
-#define IFF_DUMPPKTS(sc, _m)    netif_msg_dumppkts(&sc->sc_ic)
@@ -471 +471 @@
-         */
-        for (i = 0; i < sc->sc_keymax; i++)
-                ath_hal_keyreset(ah, i);
-        /*
-         * Mark key cache slots associated with global keys
-         * as in use.  If we knew TKIP was not to be used we
-         * could leave the +32, +64, and +32+64 slots free.
-         * XXX only for splitmic.
-         */
-        for (i = 0; i < IEEE80211_WEP_NKID; i++) {
-                setbit(sc->sc_keymap, i);
-                setbit(sc->sc_keymap, i+32);
-                setbit(sc->sc_keymap, i+64);
-                setbit(sc->sc_keymap, i+32+64);
-        }
-
-        /*
-         * Collect the channel list using the default country
@@ -763 +751 @@
-                        if (ath_hal_wmetkipmic(ah))
-                                ic->ic_caps |= IEEE80211_C_WME_TKIPMIC;
-                }
-
-
+
+
+
+
+
+
+
-                        sc->sc_splitmic = 1;
-        }
-        sc->sc_hasclrkey = ath_hal_ciphersupported(ah, HAL_CIPHER_CLR);
@@ -772 +765 @@
-        sc->sc_mcastkey = ath_hal_getmcastkeysearch(ah);
-#endif
-        /*
+         * Mark key cache slots associated with global keys
+         * as in use.  If we knew TKIP was not to be used we
+         * could leave the +32, +64, and +32+64 slots free.
+         */
+        for (i = 0; i < IEEE80211_WEP_NKID; i++) {
+                setbit(sc->sc_keymap, i);
+                setbit(sc->sc_keymap, i+64);
+                if (sc->sc_splitmic) {
+                        setbit(sc->sc_keymap, i+32);
+                        setbit(sc->sc_keymap, i+32+64);
+                }
+        }
+        /*
-         * TPC support can be done either with a global cap or
-         * per-packet support.  The latter is not available on
-         * all parts.  We're a bit pedantic here as all parts
@@ -2860 +2866 @@
-
-#ifdef AR_DEBUG
-static void
-
+struct ath_softc *sc, 
-        const HAL_KEYVAL *hk, const u_int8_t mac[IEEE80211_ADDR_LEN])
-{
-        static const char *ciphers[] = {
@@ -2878 +2884 @@
-                printk("%02x", hk->kv_val[i]);
-        printk(" mac %s", ether_sprintf(mac));
-        if (hk->kv_type == HAL_CIPHER_TKIP) {
-mic 
+%s ", sc->sc_splitmic ? "mic" : "rxmic
-                for (i = 0; i < sizeof(hk->kv_mic); i++)
-                        printk("%02x", hk->kv_mic[i]);
+#if HAL_ABI_VERSION > 0x06052200
+                if (!sc->sc_splitmic) {
+                        printk(" txmic ");
+                        for (i = 0; i < sizeof(hk->kv_txmic); i++)
+                                printk("%02x", hk->kv_txmic[i]);
+                }
+#endif
-        }
-        printk("\n");
-}
@@ -2901 +2914 @@
-
-        KASSERT(k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP,
-                ("got a non-TKIP key, cipher %u", k->wk_cipher->ic_cipher));
-        KASSERT(sc->sc_splitmic, ("key cache !split"));
-        if ((k->wk_flags & IEEE80211_KEY_XR) == IEEE80211_KEY_XR) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else if (k->wk_flags & IEEE80211_KEY_XR) {
-                /*
-                 * TX/RX key goes at first index.
@@ -2984 +3010 @@
-                mac = mac0;
-
-        if (hk.kv_type == HAL_CIPHER_TKIP &&
-
-
+
-                return ath_keyset_tkip(sc, k, &hk, mac);
-        } else {
-                KEYPRINTF(sc, k->wk_keyix, &hk, mac);
@@ -3047 +3072 @@
-}
-
-/*
+ * Allocate tx/rx key slots for TKIP.  We allocate two slots for
+ * each key, one for decrypt/encrypt and the other for the MIC.
+ */
+static u_int16_t
+key_alloc_pair(struct ath_softc *sc)
+{
+#define N(a)    (sizeof(a)/sizeof(a[0]))
+        u_int i, keyix;
+
+        KASSERT(!sc->sc_splitmic, ("key cache split"));
+        /* XXX could optimize */
+        for (i = 0; i < N(sc->sc_keymap)/4; i++) {
+                u_int8_t b = sc->sc_keymap[i];
+                if (b != 0xff) {
+                        /*
+                         * One or more slots in this byte are free.
+                         */
+                        keyix = i*NBBY;
+                        while (b & 1) {
+                again:
+                                keyix++;
+                                b >>= 1;
+                        }
+                        if (isset(sc->sc_keymap, keyix+64)) {
+                                /* full pair unavailable */
+                                /* XXX statistic */
+                                if (keyix == (i+1)*NBBY) {
+                                        /* no slots were appropriate, advance */
+                                        continue;
+                                }
+                                goto again;
+                        }
+                        setbit(sc->sc_keymap, keyix);
+                        setbit(sc->sc_keymap, keyix+64);
+                        DPRINTF(sc, ATH_DEBUG_KEYCACHE,
+                                "%s: key pair %u,%u\n",
+                                __func__, keyix, keyix+64);
+                        return keyix;
+                }
+        }
+        DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s: out of pair space\n", __func__);
+        return IEEE80211_KEYIX_NONE;
+#undef N
+}
+
+/*
- * Allocate a single key cache slot.
- */
-static u_int16_t
@@ -3133 +3204 @@
-        if (k->wk_flags & IEEE80211_KEY_SWCRYPT)
-                return key_alloc_single(sc);
-        else if (k->wk_cipher->ic_cipher == IEEE80211_CIPHER_TKIP &&
-
-
+
+
+
+
+
-        } else
-                return key_alloc_single(sc);
-}
@@ -3199 +3273 @@
-                 */
-                clrbit(sc->sc_keymap, keyix);
-                if (cip->ic_cipher == IEEE80211_CIPHER_TKIP &&
-
-
+
-                        clrbit(sc->sc_keymap, keyix + 64);      /* TX key MIC */
-
-
+
+
+
+
+
-                }
-
-                if (rxkeyoff != 0)