Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1361403pxj; Fri, 18 Jun 2021 05:38:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW6KfNczih5d84HxrsabtMVYzmdwqTVN2XhCGkP1Kai5cRfZD/BsG3zaWHsUNhk/tlYPAd X-Received: by 2002:a17:906:8988:: with SMTP id gg8mr2466161ejc.104.1624019925000; Fri, 18 Jun 2021 05:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624019924; cv=none; d=google.com; s=arc-20160816; b=HdO9fQdmDl7Ozy97TK2/rjUuc6VOwPFZ/eO+2GIXZfS5mXx1j3aiT0BFMbflyAmVdl MVJHjsY8b9mSV6BoYHvAkeDs/2M/cBTrbNCAjZbdlUXLHYK39PQpZ9byBC/9OV9gA+ho kXWv6hXTw9h2L/bfgH6fG7Qsfi8nKNfucdmJaAIBZeV/JjIKittGx2NlYFQBzL53sGPj inee4myFa0mbshWTkp4wFt3PU8CSIbq/knuy52oCge/vS9eCWLVrIh61YsyMLYWIeNkT jBCroojNa9alvPRN621XIyx27ff2mIyaxr9Sgw9PqFne//fo2NeNDv76nAsOw9g0tFqZ JBNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=OqIdgkM0Ua/6ntAeNdZTL9CDk37vHQv5sT4GlD9Qj1U=; b=KRRmMgwYPSvELH5hYwspgNOBHy4FWP7Nx16L1CwLgXPKFmqcAUXVeln/DFWGmfrcqc zTAOpRqH13CGkJEJSgSoeQh2GXgO+26deXN9IV7h2Dpk4xL/9njQBXWdJ0TGYdNJAhu0 XAMIvw0Ivbo7BJUeSOKJ4K7/geH6bbqnFHuX3BPMrvqrEnOuO+NsEG4RjHUYZ2394Odl EC4ufGaHVaat9kTz/khfJyXfIOkU15I7pnhUQVt04a9L3ZI+cL1HWlwGvc4mw8XcIuYD eeoZttL17YIVLVHEJy0aat44etvZNRFQWi0ubv0P88JP6SlGzZkeNa9m8Ifud05Lca55 qzpw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ci23si1991497ejc.585.2021.06.18.05.38.20; Fri, 18 Jun 2021 05:38:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233947AbhFRLHN (ORCPT + 99 others); Fri, 18 Jun 2021 07:07:13 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:48276 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S233950AbhFRLHJ (ORCPT ); Fri, 18 Jun 2021 07:07:09 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=kveik.lan) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1luBx6-001YXx-HU; Fri, 18 Jun 2021 13:42:22 +0300 From: Luca Coelho To: johannes@sipsolutions.net Cc: luca@coelho.fi, linux-wireless@vger.kernel.org Date: Fri, 18 Jun 2021 13:41:49 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618104156.747775-1-luca@coelho.fi> References: <20210618104156.747775-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.5-pre1 (2020-06-20) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.5-pre1 Subject: [PATCH 24/31] mac80211: reset profile_periodicity/ema_ap Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg Apparently we never clear these values, so they'll remain set since the setting of them is conditional. Clear the values in the relevant other cases. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- net/mac80211/mlme.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 3eee75571650..a0d77539d1d9 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -3993,10 +3993,14 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, if (elems.mbssid_config_ie) bss_conf->profile_periodicity = elems.mbssid_config_ie->profile_periodicity; + else + bss_conf->profile_periodicity = 0; if (elems.ext_capab_len >= 11 && (elems.ext_capab[10] & WLAN_EXT_CAPA11_EMA_SUPPORT)) bss_conf->ema_ap = true; + else + bss_conf->ema_ap = false; /* continue assoc process */ ifmgd->assoc_data->timeout = jiffies; @@ -5734,12 +5738,16 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, beacon_ies->data, beacon_ies->len); if (elem && elem->datalen >= 3) sdata->vif.bss_conf.profile_periodicity = elem->data[2]; + else + sdata->vif.bss_conf.profile_periodicity = 0; elem = cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY, beacon_ies->data, beacon_ies->len); if (elem && elem->datalen >= 11 && (elem->data[10] & WLAN_EXT_CAPA11_EMA_SUPPORT)) sdata->vif.bss_conf.ema_ap = true; + else + sdata->vif.bss_conf.ema_ap = false; } else { assoc_data->timeout = jiffies; assoc_data->timeout_started = true; -- 2.32.0