diff options
| author | Sujith Manoharan <c_manoha@qca.qualcomm.com> | 2012-03-14 14:41:05 +0530 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-15 13:40:29 -0400 |
| commit | d47a61aa228709fe1704e18a2f444661c10b81c0 (patch) | |
| tree | ec05c107b4ceddcb203453004d9002f1d40723cb /drivers/net/wireless/ath/ath9k/xmit.c | |
| parent | 3d4e20f2d1e720c63887aee6a985e7870baf4ba1 (diff) | |
ath9k: Fix multi-VIF BSS handling
mac80211 provides short preamble information and ERP protection
information on a per-BSS basis, which can be used. Remove flags
stored in the driver, which was incorrect since they were being used
in a global manner.
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/xmit.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index d2c635d84fb..5faec1e04d6 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c @@ -955,7 +955,9 @@ static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, */ rate = ieee80211_get_rts_cts_rate(sc->hw, tx_info); info->rtscts_rate = rate->hw_value; - if (sc->sc_flags & SC_OP_PREAMBLE_SHORT) + + if (tx_info->control.vif && + tx_info->control.vif->bss_conf.use_short_preamble) info->rtscts_rate |= rate->hw_value_short; for (i = 0; i < 4; i++) { |