commit c3fc36d0f35c4cee64f2ca4a70a7bd15632073f1 Author: Jiri Slaby Date: Sun Jul 15 16:05:38 2007 +0200 attach cleanup diff --git a/ath.c b/ath.c index 7367a88..871a58d 100644 --- a/ath.c +++ b/ath.c @@ -1645,8 +1645,6 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) * beacon frames and one data queue for each QoS * priority. Note that the hal handles reseting * these queues at the needed time. - * - * XXX PS-Poll */ ret = ath_beaconq_setup(ah); if (ret < 0) { @@ -1673,28 +1671,14 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) tasklet_init(&sc->rxtq, ath_tasklet_rx, (unsigned long)sc); tasklet_init(&sc->txtq, ath_tasklet_tx, (unsigned long)sc); #ifdef BLE - /* - * Setup rate control. Some rate control modules - * call back to change the anntena state so expose - * the necessary entry points. - * XXX maybe belongs in struct ath_ratectrl? - */ - sc->sc_setdefantenna = ath_setdefantenna; - sc->sc_rc = ath_rate_attach(sc); - if (sc->sc_rc == NULL) { - error = EIO; - goto bad2; - } - - setup_timer(&sc->scan_ch, ath_next_scan, (unsigned long)hw); setup_timer(&sc->cal_ch, ath_calibrate, (unsigned long)hw); + setup_timer(&sc->sc_ledtimer, ath_led_off, (unsigned long)sc); sc->blinking = 0; sc->ledstate = 1; sc->ledon = 0; /* low true */ sc->ledidle = msecs_to_jiffies(2700); /* 2.7sec */ - setup_timer(&sc->sc_ledtimer, ath_led_off, (unsigned long)sc); /* * Auto-enable soft led processing for IBM cards and for * 5211 minipci cards. Users can also manually enable/disable @@ -1707,21 +1691,13 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) ath5k_hw_set_gpio(ah, sc->sc_ledpin, !sc->sc_ledon); } - sc->sc_hasclrkey = ath_hal_ciphersupported(ah, AR5K_CIPHER_CLR); sc->sc_mcastkey = ath_hal_getmcastkeysearch(ah); /* - * Query the hal about antenna support. - */ - sc->sc_defant = ath5k_hw_get_def_antenna(ah); - - /* * Not all chips have the VEOL support we want to * use with IBSS beacons; check here for it. */ sc->sc_hasveol = ath_hal_hasveol(ah); - - sc->sc_rxfilter = 0; #endif ath5k_hw_get_lladdr(ah, mac); @@ -1737,13 +1713,9 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) goto err_queues; } -// ath_dynamic_sysctl_register(sc); -// ath_announce(sc); - return 0; err_queues: ath_tx_cleanup(sc); -//err_desc: ath_desc_free(sc, pdev); err: return ret;