From 4ced8d6cf0cf2c1e9706c2f5686623fe73a2904c Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 25 Jul 2012 17:06:47 +0200 Subject: [PATCH] --- yaml --- r: 327685 b: refs/heads/master c: da0cabb8de68d9dba254810f65aa7146eb5f47b3 h: refs/heads/master i: 327683: 78d8c55a3dae24f29011479d9dc77b36fb8c5b23 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c1eb50880550..8236edda03b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9679142291f51515bd1bf492535e8a12515558e9 +refs/heads/master: da0cabb8de68d9dba254810f65aa7146eb5f47b3 diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c index a5f7bce96325..908ff2536950 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/trunk/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 |