aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2013-06-12 10:48:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-06-12 15:06:57 -0400
commitd5346171d721bcfaab5843bf996ac6a379f7bd93 (patch)
tree33547645a691120b3e35f2dde7c550e53175ea6f /drivers/net/wireless/iwlegacy
parentc72456c75ae48d4d747c2ad4f7fe82601484a949 (diff)
Revert "iwl4965: workaround connection regression on passive channel"
This reverts commit dd9c46408fdc07098333655ff27edf8cac8d9fcf. With "iwl{4965,3495): workaround for firmware frame tx rejection" patches we can enable IEEE80211_HW_REPORTS_TX_ACK_STATUS again. Tested-by: Jake Edge <jake@lwn.net> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
-rw-r--r--drivers/net/wireless/iwlegacy/4965-mac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 1c44bb59f6c8..d287fd2dce42 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5759,7 +5759,8 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length)
5759 hw->flags = 5759 hw->flags =
5760 IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_AMPDU_AGGREGATION | 5760 IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_AMPDU_AGGREGATION |
5761 IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | IEEE80211_HW_SPECTRUM_MGMT | 5761 IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | IEEE80211_HW_SPECTRUM_MGMT |
5762 IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_SUPPORTS_DYNAMIC_PS; 5762 IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_SUPPORTS_PS |
5763 IEEE80211_HW_SUPPORTS_DYNAMIC_PS;
5763 if (il->cfg->sku & IL_SKU_N) 5764 if (il->cfg->sku & IL_SKU_N)
5764 hw->flags |= 5765 hw->flags |=
5765 IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | 5766 IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |