aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMohammed Shafi Shajakhan <mshajakhan@atheros.com>2010-12-30 01:48:01 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-01-04 14:43:01 -0500
commitbd8027a72a1af95efd1dc8ea6df2fd9724c885b2 (patch)
tree9845cb15e26a2f0a64ccc707368a60cafb8c8392 /drivers
parentff039c6fb372c87a3cc4fd25bb846790cb35edb8 (diff)
Revert "ath9k: Parse DTIM period from mac80211"
This reverts commit 0ce3bcfc84900a64347b0fe1140229bd81314008. Event though with the above commit we obtain the configured DTIM period from the AP rather than always hardcoding it to '1', this seems to cause problems under the following scenarios: * Preventing association with broken AP's * Adds latency in roaming So its better to always use the safe value of '1' for dtim period Cc: Jouni Malinen <Jouni.Malinen@Atheros.com> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/htc_drv_init.c3
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 9150ca665367..38433f9bfe59 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -716,8 +716,7 @@ static void ath9k_set_hw_capab(struct ath9k_htc_priv *priv,
716 IEEE80211_HW_HAS_RATE_CONTROL | 716 IEEE80211_HW_HAS_RATE_CONTROL |
717 IEEE80211_HW_RX_INCLUDES_FCS | 717 IEEE80211_HW_RX_INCLUDES_FCS |
718 IEEE80211_HW_SUPPORTS_PS | 718 IEEE80211_HW_SUPPORTS_PS |
719 IEEE80211_HW_PS_NULLFUNC_STACK | 719 IEEE80211_HW_PS_NULLFUNC_STACK;
720 IEEE80211_HW_NEED_DTIM_PERIOD;
721 720
722 hw->wiphy->interface_modes = 721 hw->wiphy->interface_modes =
723 BIT(NL80211_IFTYPE_STATION) | 722 BIT(NL80211_IFTYPE_STATION) |
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index efb778d4356a..b6643b5bf050 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -648,8 +648,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
648 IEEE80211_HW_SUPPORTS_PS | 648 IEEE80211_HW_SUPPORTS_PS |
649 IEEE80211_HW_PS_NULLFUNC_STACK | 649 IEEE80211_HW_PS_NULLFUNC_STACK |
650 IEEE80211_HW_SPECTRUM_MGMT | 650 IEEE80211_HW_SPECTRUM_MGMT |
651 IEEE80211_HW_REPORTS_TX_ACK_STATUS | 651 IEEE80211_HW_REPORTS_TX_ACK_STATUS;
652 IEEE80211_HW_NEED_DTIM_PERIOD;
653 652
654 if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT) 653 if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_HT)
655 hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION; 654 hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;