diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-12 11:06:52 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-12 11:06:52 -0500 |
| commit | 4fe0c75eedb15af13859ef123db17fefed5af7ae (patch) | |
| tree | 6ed38d8e2e0ae457d10a2af2e496e9ecb4d34e08 /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | 8457703f1e86aaf0f134402dd1e09e1f13e65222 (diff) | |
| parent | 9c35d7d2368f54313b988a01c408e5cf863ffd9e (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index 75f6f6cfdd47..0fccf725a2e6 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c | |||
| @@ -151,8 +151,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, | |||
| 151 | IEEE80211_HW_QUEUE_CONTROL | | 151 | IEEE80211_HW_QUEUE_CONTROL | |
| 152 | IEEE80211_HW_SUPPORTS_PS | | 152 | IEEE80211_HW_SUPPORTS_PS | |
| 153 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | | 153 | IEEE80211_HW_SUPPORTS_DYNAMIC_PS | |
| 154 | IEEE80211_HW_WANT_MONITOR_VIF | | 154 | IEEE80211_HW_WANT_MONITOR_VIF; |
| 155 | IEEE80211_HW_SCAN_WHILE_IDLE; | ||
| 156 | 155 | ||
| 157 | hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE; | 156 | hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE; |
| 158 | hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FMT; | 157 | hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FMT; |