diff options
| author | Johannes Berg | 2013-07-01 13:48:56 +0200 |
|---|---|---|
| committer | Johannes Berg | 2013-07-25 15:02:59 +0200 |
| commit | da4f87f088b3ddfc9153aa3559834a3922da4395 (patch) | |
| tree | 8e7022e3eaf8e3b09b5d9c1ad7631604a4e6fe39 /drivers/net/wireless/iwlwifi/dvm/rxon.c | |
| parent | iwlwifi: mvm: don't allocate BT_COEX cmd on stack (diff) | |
| download | kernel-qcow2-linux-da4f87f088b3ddfc9153aa3559834a3922da4395.tar.gz kernel-qcow2-linux-da4f87f088b3ddfc9153aa3559834a3922da4395.tar.xz kernel-qcow2-linux-da4f87f088b3ddfc9153aa3559834a3922da4395.zip | |
iwlwifi: dvm: remove P2P support
We're not planning to support P2P on older devices, so
remove the Kconfig option and associated code for it.
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
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; |