From patchwork Fri Oct 11 20:49:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wang X-Patchwork-Id: 1175724 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uGdceisU"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Qyuh24Fs"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46r81C42gPz9sNx for ; Sun, 13 Oct 2019 02:31:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=fnom1PRhW5AHr+wjHnzoJCHxhkA2WwXsgAbiW5EKDQ4=; b=uGdceisUnNHEZO 5/EwG70CW3626bqNWl6ZMGLfhakPt8yws0AftuDGQdogooBzutKFoSWP/F/vkVzFlwKM3mbDrU9PM av/GsF99pvEZSpum73svbm3qnVTw5Bwi+7sudFXppA1RhBlBVVEFB3C1mmsEN8r1DKhpbeUeXdDVh QDHowdHaS4Shf4rDHNIbM+vXvzv4EE7ImVLaNoTszDguKk+5zazDkKkgtGTJzyfX9uMDzTyT6SIY6 fRLsOYgKC2x2pYHKk68zFnwOTGnIjT7QRUaBiXnheBOIxwbAkJpFqP9vF03YYMtRGqpMxLbw7ip7R I2zcXak26q0Am6qjJWrg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iJJMJ-0000vH-1T; Sat, 12 Oct 2019 15:31:07 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iJ1rA-0001z7-NY for hostap@lists.infradead.org; Fri, 11 Oct 2019 20:49:50 +0000 Received: by mail-pf1-x444.google.com with SMTP id x127so6760890pfb.7 for ; Fri, 11 Oct 2019 13:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y7eDb7kdgS6bdJ3UMqtmJFJgygMPvVvczDmmjuo3oVU=; b=Qyuh24FsQoj5SMWHXUofOqg4y8fp6autI2nVfufdXrmRZRVObASLUGNguKREuaYerT BBjn6FGcpw1o0I23ZxFvMAb9pYabjzo2ddof5YvQTRtJCeSapk8GkyH3+iY5hkV5VZ8D 20wtcvCZSxiKG8pzzwEFHcY6KnFOSm1pNayJI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Y7eDb7kdgS6bdJ3UMqtmJFJgygMPvVvczDmmjuo3oVU=; b=ZsvchEkdSVJ2BDd53Ae64aibDDt5hbctPN8BOj/O6nmY9EI7CULtFqM/Iy6mmF2Cge 9qs2LAqOIM9HIG1oa10S4xMt2n3zZ4dIMAGTgGtFzr0DAFhzNdggGP37mJWwHpSdhppJ AjazsKPvImsjXNm+fTC5w+m/rG0swHj3NkqFYKUloYaFgg7xIKW5i+K4VAloueQeq3EB ERcO4jFELJU4VkJV9L1o0fsANyE1AlcjDNv0KaAI6zKWmuLOiY1wiN4a397CQiEltCTH yTdWHHB564RARB+kMBJ30q1Zvx+I9L+70WYm8HFI5qcgXtR7S+Yr3sYWQxevWqtZa4AF dJzQ== X-Gm-Message-State: APjAAAVZzvSwYKbtd4xlplG5cByFmuL+oeFV1rM0kYXrF9/Cks1frVyE 3HVGE0j0MK81tBVITFEDXOAKlg== X-Google-Smtp-Source: APXvYqxH5I1p1YmUMrqZzSTiWrcsjT1JvQArFV1dGomGAbFZEnKGQzpzrFz4jUi+qMYqCmWsinfTmg== X-Received: by 2002:a17:90a:a605:: with SMTP id c5mr20468741pjq.28.1570826987346; Fri, 11 Oct 2019 13:49:47 -0700 (PDT) Received: from localhost ([2620:15c:202:201:2b10:8627:31e7:c5ec]) by smtp.gmail.com with ESMTPSA id q42sm9029384pja.16.2019.10.11.13.49.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 11 Oct 2019 13:49:46 -0700 (PDT) From: Matthew Wang To: j@w1.fi Subject: [PATCH] dbus: move roam metrics Date: Fri, 11 Oct 2019 13:49:25 -0700 Message-Id: <20191011204925.107808-1-matthewmwang@chromium.org> X-Mailer: git-send-email 2.23.0.700.g56cf767bdb-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191011_134948_800439_BC7ED034 X-CRM114-Status: UNSURE ( 8.34 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-Mailman-Approved-At: Sat, 12 Oct 2019 08:31:05 -0700 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ejcaruso@chromium.org, hostap@lists.infradead.org, matthewmwang@chromium.org, npoojary@chromium.org, briannorris@chromium.org Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org These properties were in the wpas_dbus_bss_properties array when they should have been in the wpas_dbus_interface_properties array. Move them to the right place. Signed-off-by: Matthew Wang --- wpa_supplicant/dbus/dbus_new.c | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index 4df61f233..65ddcf657 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -2855,30 +2855,6 @@ static const struct wpa_dbus_property_desc wpas_dbus_bss_properties[] = { NULL, NULL }, - { - "RoamTime", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", - wpas_dbus_getter_roam_time, - NULL, - NULL - }, - { - "RoamComplete", WPAS_DBUS_NEW_IFACE_INTERFACE, "b", - wpas_dbus_getter_roam_complete, - NULL, - NULL - }, - { - "SessionLength", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", - wpas_dbus_getter_session_length, - NULL, - NULL - }, - { - "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", - wpas_dbus_getter_bss_tm_status, - NULL, - NULL - }, { NULL, NULL, NULL, NULL, NULL, NULL } }; @@ -3794,6 +3770,30 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = { NULL, NULL }, + { + "RoamTime", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", + wpas_dbus_getter_roam_time, + NULL, + NULL + }, + { + "RoamComplete", WPAS_DBUS_NEW_IFACE_INTERFACE, "b", + wpas_dbus_getter_roam_complete, + NULL, + NULL + }, + { + "SessionLength", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", + wpas_dbus_getter_session_length, + NULL, + NULL + }, + { + "BSSTMStatus", WPAS_DBUS_NEW_IFACE_INTERFACE, "u", + wpas_dbus_getter_bss_tm_status, + NULL, + NULL + }, #ifdef CONFIG_MESH { "MeshPeers", WPAS_DBUS_NEW_IFACE_MESH, "aay", wpas_dbus_getter_mesh_peers,