diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-11-10 06:55:22 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-11 12:32:55 -0500 |
| commit | eb32043f430d74d4381b29273d174b376593d072 (patch) | |
| tree | a7fa0ac34cc1d3696f49770a0070af533d75a0d2 /drivers/net/wireless/iwlwifi/iwl-scan.c | |
| parent | 3ddf6befb98d5dd61466a0e0e585037f6dca352f (diff) | |
| download | blackbird-op-linux-eb32043f430d74d4381b29273d174b376593d072.tar.gz blackbird-op-linux-eb32043f430d74d4381b29273d174b376593d072.zip | |
iwlagn: don't always split remain-on-channel
Due to the P2P context always having the associated
bit set when we got to this code, we were splitting
up the remain-on-channel durations unconditionally.
This isn't needed -- if the P2P context is in P2P
device type mode it doesn't impose restrictions on
timing to skip it in that case.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 625beec4aa22..359d2182757b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -416,6 +416,8 @@ static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time) if (!iwl_is_associated_ctx(ctx)) continue; + if (ctx->staging.dev_type == RXON_DEV_TYPE_P2P) + continue; value = ctx->beacon_int; if (!value) value = IWL_PASSIVE_DWELL_BASE; |
