commit 30e00a40ea121bec2efac8a1748b96021d5353cf Author: Jiri Slaby Date: Thu Jul 19 08:28:14 2007 +0200 change BLE to BEACON in beacon related stuff diff --git a/ath.c b/ath.c index fedc3c3..847589b 100644 --- a/ath.c +++ b/ath.c @@ -669,7 +669,7 @@ static void ath_draintxq(struct ath_softc *sc) /* XXX return value */ if (likely(!sc->invalid)) { -#ifdef BLE +#ifdef BEACON /* don't touch the hardware if marked invalid */ (void)ath5k_hw_stop_tx_dma(ah, sc->bhalq); DPRINTF(sc, ATH_DEBUG_RESET, "%s: beacon queue %x\n", __func__, @@ -1563,7 +1563,11 @@ static int ath_desc_alloc(struct ath_softc *sc, struct pci_dev *pdev) DPRINTF(sc, ATH_DEBUG_ANY, "%s: DMA map: %p (%zu) -> %llx\n", __func__, ds, sc->desc_len, (unsigned long long)sc->desc_daddr); - bf = kcalloc(ATH_TXBUF + ATH_RXBUF + /*ATH_BCBUF +*/ 1, + bf = kcalloc(1 + ATH_TXBUF + ATH_RXBUF +#ifdef BEACON + + ATH_BCBUF +#endif + , sizeof(struct ath_buf), GFP_KERNEL); if (bf == NULL) { dev_err(&pdev->dev, "can't allocate bufptr\n"); @@ -1586,7 +1590,7 @@ static int ath_desc_alloc(struct ath_softc *sc, struct pci_dev *pdev) bf->daddr = da; list_add_tail(&bf->list, &sc->txbuf); } -#ifdef BLE +#ifdef BEACON INIT_LIST_HEAD(&sc->bbuf); for (i = 0; i < ATH_BCBUF; i++, bf++, ds++, da += sizeof(*ds)) { bf->desc = ds; @@ -1630,7 +1634,7 @@ static void ath_desc_free(struct ath_softc *sc, struct pci_dev *pdev) kfree(sc->bufptr); sc->bufptr = NULL; } -#ifdef BLE +#ifdef BEACON static int ath_beaconq_setup(struct ath_hw *ah) { struct ath5k_txq_info qi; @@ -1762,7 +1766,7 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) goto err; } -#ifdef BLE +#ifdef BEACON /* * Allocate hardware transmit queues: one queue for * beacon frames and one data queue for each QoS @@ -1818,9 +1822,7 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) ath5k_hw_set_gpio_output(ah, sc->led_pin); ath5k_hw_set_gpio(ah, sc->led_pin, !sc->led_on); } -#ifdef BLE - sc->sc_mcastkey = ath_hal_getmcastkeysearch(ah); - +#ifdef BEACON /* * Not all chips have the VEOL support we want to * use with IBSS beacons; check here for it.