iwlagn: support new P2P implementation

[linux.git] / drivers / net / wireless / iwlwifi / iwl-agn-rxon.c

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index d42ef1763a711a06a994990b59ea858d8fec244b..d562e9359d97f7ae6fc85b0431e175189d97f1bd 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -337,10 +337,10 @@ 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_channel) {
+       if (priv->hw_roc_setup) {
                /* both contexts must be used for this to happen */
-               slot1 = priv->hw_roc_duration;
-               slot0 = IWL_MIN_SLOT_TIME;
+               slot1 = IWL_MIN_SLOT_TIME;
+               slot0 = 3000;
        } else if (ctx_bss->vif && ctx_pan->vif) {
                int bcnint = ctx_pan->beacon_int;
                int dtim = ctx_pan->vif->bss_conf.dtim_period ?: 1;
@@ -437,23 +437,6 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
        /* always get timestamp with Rx frame */
        ctx->staging.flags |= RXON_FLG_TSF2HOST_MSK;
 
-       if (ctx->ctxid == IWL_RXON_CTX_PAN && priv->hw_roc_channel) {
-               struct ieee80211_channel *chan = priv->hw_roc_channel;
-
-               iwl_set_rxon_channel(priv, chan, ctx);
-               iwl_set_flags_for_band(priv, ctx, chan->band, NULL);
-               ctx->staging.filter_flags |=
-                       RXON_FILTER_ASSOC_MSK |
-                       RXON_FILTER_PROMISC_MSK |
-                       RXON_FILTER_CTL2HOST_MSK;
-               ctx->staging.dev_type = RXON_DEV_TYPE_P2P;
-               new_assoc = true;
-
-               if (memcmp(&ctx->staging, &ctx->active,
-                          sizeof(ctx->staging)) == 0)
-                       return 0;
-       }
-
        /*
         * force CTS-to-self frames protection if RTS-CTS is not preferred
         * one aggregation protection method