diff options
author | David S. Miller <davem@davemloft.net> | 2014-08-14 15:17:37 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-14 15:17:37 -0700 |
commit | a61ebdfdb13a051f707b408d464f63b991aa21e3 (patch) | |
tree | 4e175cc207463251e4335fdab7dff9fb056f199d /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
parent | 9ce12eb16ffb143f3a509da86283ddd0b10bcdb3 (diff) | |
parent | 77b2f2865956b7573f9b040db7a9f808b434acd1 (diff) | |
download | op-kernel-dev-a61ebdfdb13a051f707b408d464f63b991aa21e3.zip op-kernel-dev-a61ebdfdb13a051f707b408d464f63b991aa21e3.tar.gz |
Merge tag 'master-2014-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
pull request: wireless 2014-08-14
Please pull this batch of fixes intended for the 3.17 stream...
Arend van Spriel brings two brcmfmac fixes, one which fixes a memory
leak and one which corrects some merge damage.
Emmanuel Grumbach fixes Linus's iwlwifi firmware-related log spam.
Rickard Strandqvist does some proper NULL termination after a call
to strncpy.
Ronald Wahl corrects a carl9170 problem with sending URBs with the
wrong endpoint type (resulting in log spam).
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 0d6a8b7..7c87965 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -396,7 +396,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) else hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; - hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; + /* TODO: enable that only for firmwares that don't crash */ + /* hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; */ hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX; hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES; /* we create the 802.11 header and zero length SSID IE. */ |