commit 1775e4b72abfcf03894a6c64d811fc6bc456f065 Author: Jiri Slaby Date: Fri Jul 6 23:17:40 2007 +0200 remove other tx setups diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c index 4844e21..b93d0ed 100644 --- a/ath/if_ath_pci.c +++ b/ath/if_ath_pci.c @@ -1440,42 +1440,6 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) goto err_queues; } #ifdef BLE - if (!ath_tx_setup(sc, WME_AC_BE, AR5K_WME_AC_BE) || - !ath_tx_setup(sc, WME_AC_VI, AR5K_WME_AC_VI) || - !ath_tx_setup(sc, WME_AC_VO, AR5K_WME_AC_VO)) { - /* - * Not enough hardware tx queues to properly do WME; - * just punt and assign them all to the same h/w queue. - * We could do a better job of this if, for example, - * we allocate queues when we switch from station to - * AP mode. - */ - if (sc->sc_ac2q[WME_AC_VI] != NULL) - ath_tx_cleanupq(sc, sc->sc_ac2q[WME_AC_VI]); - if (sc->sc_ac2q[WME_AC_BE] != NULL) - ath_tx_cleanupq(sc, sc->sc_ac2q[WME_AC_BE]); - sc->sc_ac2q[WME_AC_BE] = sc->sc_ac2q[WME_AC_BK]; - sc->sc_ac2q[WME_AC_VI] = sc->sc_ac2q[WME_AC_BK]; - sc->sc_ac2q[WME_AC_VO] = sc->sc_ac2q[WME_AC_BK]; - } - - /* - * Special case certain configurations. Note the - * CAB queue is handled by these specially so don't - * include them when checking the txq setup mask. - */ - switch (sc->sc_txqsetup &~ (1<sc_cabq->axq_qnum)) { - case 0x01: - ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_tasklet_q0, dev); - break; - case 0x0f: - ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_tasklet_q0123, dev); - break; - default: - ATH_INIT_TQUEUE(&sc->sc_txtq, ath_tx_tasklet, dev); - break; - } - /* * Setup rate control. Some rate control modules * call back to change the anntena state so expose