diff options
| author | Johannes Berg | 2013-02-15 23:39:17 +0100 |
|---|---|---|
| committer | Johannes Berg | 2013-02-18 20:16:26 +0100 |
| commit | b18bf9733c4ca4db6fdb692895fabc9d934b7303 (patch) | |
| tree | 981a01386be5098aac692b96c203b5245cad8c2a | |
| parent | Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next (diff) | |
| download | kernel-qcow2-linux-b18bf9733c4ca4db6fdb692895fabc9d934b7303.tar.gz kernel-qcow2-linux-b18bf9733c4ca4db6fdb692895fabc9d934b7303.tar.xz kernel-qcow2-linux-b18bf9733c4ca4db6fdb692895fabc9d934b7303.zip | |
iwlwifi: mvm: fix merge error
The iwlwifi-next tree removed IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC
while the mac80211-next tree removed
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index e27eb9724112..6fb084f2c257 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -113,7 +113,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_QUEUE_CONTROL | IEEE80211_HW_WANT_MONITOR_VIF | - IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC | IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | IEEE80211_HW_AMPDU_AGGREGATION; |