diff options
| author | Johannes Berg | 2010-08-23 10:46:57 +0200 |
|---|---|---|
| committer | Wey-Yi Guy | 2010-08-27 18:49:08 +0200 |
| commit | bde4530e9d2fa013b5674e4c9b066ed6d87ab45c (patch) | |
| tree | 202594556826549d87cf482d36c32a16072bcf16 | |
| parent | iwlagn: always send RXON timing (diff) | |
| download | kernel-qcow2-linux-bde4530e9d2fa013b5674e4c9b066ed6d87ab45c.tar.gz kernel-qcow2-linux-bde4530e9d2fa013b5674e4c9b066ed6d87ab45c.tar.xz kernel-qcow2-linux-bde4530e9d2fa013b5674e4c9b066ed6d87ab45c.zip | |
iwlwifi: follow main beacon interval
It is necessary that the PAN context always
use the same beacon interval as the BSS
context unless it is in dual-station mode,
ie. the PAN context is a station as well,
so implement that.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 91ca5173e862..a2b39fd4081e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c @@ -525,9 +525,16 @@ int iwl_send_rxon_timing(struct iwl_priv *priv, struct iwl_rxon_context *ctx) */ ctx->timing.atim_window = 0; - beacon_int = iwl_adjust_beacon_interval(beacon_int, + if (ctx->ctxid == IWL_RXON_CTX_PAN && + (!ctx->vif || ctx->vif->type != NL80211_IFTYPE_STATION)) { + ctx->timing.beacon_interval = + priv->contexts[IWL_RXON_CTX_BSS].timing.beacon_interval; + beacon_int = le16_to_cpu(ctx->timing.beacon_interval); + } else { + beacon_int = iwl_adjust_beacon_interval(beacon_int, priv->hw_params.max_beacon_itrvl * TIME_UNIT); - ctx->timing.beacon_interval = cpu_to_le16(beacon_int); + ctx->timing.beacon_interval = cpu_to_le16(beacon_int); + } tsf = priv->timestamp; /* tsf is modifed by do_div: copy it */ interval_tm = beacon_int * TIME_UNIT; |