diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-22 13:53:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-22 13:53:27 -0400 |
| commit | 2c316e699fa40f2fc161ebb770b6e2845db4f3b0 (patch) | |
| tree | 6dce3aa33e10f92e9df01521daea72367084683e /drivers/net | |
| parent | 20b4f9c73ff4137d720c4f378e1a780ac6a6c04d (diff) | |
| parent | 7bacc782270ff7db3b9f29fa5d24ad2ee1e8e81d (diff) | |
| download | linux-2c316e699fa40f2fc161ebb770b6e2845db4f3b0.tar.bz2 | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index b41dc84e9431..8735ef1f44ae 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -826,7 +826,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, if (ret) goto out_remove_mac; - if (!mvm->bf_allowed_vif && + if (!mvm->bf_allowed_vif && false && vif->type == NL80211_IFTYPE_STATION && !vif->p2p && mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED){ mvm->bf_allowed_vif = mvmvif; |