diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-05-10 10:29:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-05-10 10:29:24 -0400 |
| commit | 4f81d715b90b7ebe049dd906511c47956086ad44 (patch) | |
| tree | 80810bd165359e940a30ac4852f95a628bbb1610 /drivers/net/wireless/iwlegacy | |
| parent | 70eba4226d9718946941c7be0c8cb66d431e7686 (diff) | |
| parent | ccd384b10420ac81ba3fb9b0a7d18272c7173552 (diff) | |
| download | blackbird-obmc-linux-4f81d715b90b7ebe049dd906511c47956086ad44.tar.gz blackbird-obmc-linux-4f81d715b90b7ebe049dd906511c47956086ad44.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index b8f82e688c72..9a95045c97b6 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c @@ -5741,8 +5741,7 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length) hw->flags = IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_AMPDU_AGGREGATION | IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | IEEE80211_HW_SPECTRUM_MGMT | - IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_SUPPORTS_PS | - IEEE80211_HW_SUPPORTS_DYNAMIC_PS; + IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_SUPPORTS_DYNAMIC_PS; if (il->cfg->sku & IL_SKU_N) hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | |
