diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-02 23:37:34 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-02 23:37:34 +0400 |
| commit | 204162296edf0d0ac3e4dfd5bd0cac4af731b583 (patch) | |
| tree | fdf941fd23fae6097500db4998d4ca96467fc352 /drivers/net/wireless/iwlwifi/dvm/rxon.c | |
| parent | e3d5291436ff9efeeb968459724af5332305dded (diff) | |
| parent | 147fc9be81d10e6e863323c0b54e140b42fd1ed6 (diff) | |
| download | linux-204162296edf0d0ac3e4dfd5bd0cac4af731b583.tar.xz | |
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/rxon.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/rxon.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c index cd1ad0019185..d7ce2f12a907 100644 --- a/drivers/net/wireless/iwlwifi/dvm/rxon.c +++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c @@ -564,11 +564,7 @@ int iwlagn_set_pan_params(struct iwl_priv *priv) cmd.slots[0].type = 0; /* BSS */ cmd.slots[1].type = 1; /* PAN */ - if (priv->hw_roc_setup) { - /* both contexts must be used for this to happen */ - slot1 = IWL_MIN_SLOT_TIME; - slot0 = 3000; - } else if (ctx_bss->vif && ctx_pan->vif) { + if (ctx_bss->vif && ctx_pan->vif) { int bcnint = ctx_pan->beacon_int; int dtim = ctx_pan->vif->bss_conf.dtim_period ?: 1; |