diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2012-03-14 05:10:58 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-15 13:40:29 -0400 |
| commit | 3d4e20f2d1e720c63887aee6a985e7870baf4ba1 (patch) | |
| tree | 9f37b2c40b820b8085168d5abc3e245b2972d568 /drivers/net/wireless/ath/ath9k/init.c | |
| parent | caed6579c2f9756d3f5a95e8186fa4c04d64cae2 (diff) | |
ath9k: Remove aggregation flags
SC_OP_TXAGGR and SC_OP_RXAGGR are not really needed.
The HT capabilities of the station and HW can be used instead.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/init.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 944e9b518f19..2708d1fc2c10 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
| @@ -484,19 +484,12 @@ static void ath9k_init_misc(struct ath_softc *sc) | |||
| 484 | { | 484 | { |
| 485 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); | 485 | struct ath_common *common = ath9k_hw_common(sc->sc_ah); |
| 486 | int i = 0; | 486 | int i = 0; |
| 487 | |||
| 487 | setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc); | 488 | setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc); |
| 488 | 489 | ||
| 489 | sc->config.txpowlimit = ATH_TXPOWER_MAX; | 490 | sc->config.txpowlimit = ATH_TXPOWER_MAX; |
| 490 | |||
| 491 | if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) { | ||
| 492 | sc->sc_flags |= SC_OP_TXAGGR; | ||
| 493 | sc->sc_flags |= SC_OP_RXAGGR; | ||
| 494 | } | ||
| 495 | |||
| 496 | sc->rx.defant = ath9k_hw_getdefantenna(sc->sc_ah); | 491 | sc->rx.defant = ath9k_hw_getdefantenna(sc->sc_ah); |
| 497 | |||
| 498 | memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN); | 492 | memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN); |
| 499 | |||
| 500 | sc->beacon.slottime = ATH9K_SLOT_TIME_9; | 493 | sc->beacon.slottime = ATH9K_SLOT_TIME_9; |
| 501 | 494 | ||
| 502 | for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) | 495 | for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++) |