diff options
| author | John W. Linville | 2012-08-22 20:15:47 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-08-22 20:15:47 +0200 |
| commit | 6de3f7e911d27d6737c79b3f6b5069044ea408ec (patch) | |
| tree | 186dcf1897be76a4155f5a22a7f242c29f328c5a /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | carl9170: report A-MPDU status (diff) | |
| parent | iwlwifi: fix FW restart on init FW (diff) | |
| download | kernel-qcow2-linux-6de3f7e911d27d6737c79b3f6b5069044ea408ec.tar.gz kernel-qcow2-linux-6de3f7e911d27d6737c79b3f6b5069044ea408ec.tar.xz kernel-qcow2-linux-6de3f7e911d27d6737c79b3f6b5069044ea408ec.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index e64af60a37c1..ff8162d4c454 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -195,7 +195,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, ARRAY_SIZE(iwlagn_iface_combinations_dualmode); } - hw->wiphy->max_remain_on_channel_duration = 1000; + hw->wiphy->max_remain_on_channel_duration = 500; hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY | WIPHY_FLAG_DISABLE_BEACON_HINTS | |