From nobody Wed Mar 30 15:49:36 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D856E1A53D44; Wed, 30 Mar 2022 15:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KT9q44V7Hz3k95; Wed, 30 Mar 2022 15:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648655376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXXJjcDG9xteT1uYOfDL16WEpatfPqO6fXRcpINXCRc=; b=FilDUn4WgagnGBcepj5CPa0PpQuu5X0qZDZPgVx8f8/M+BvRsEzdU5MF6oIUJgnf/0TaWH vRs7XhX2ckHFxOJWpIaTE3M1Cf459auRtYLbcaQjDCpctO4iIpxjcz0vwuhainnMGO4nxA aEIDPZp1AJei0iupieElH95T1yBshlDZdMPVReH26w+SYOVinaLED4JSGOB8O8mwLHPm07 w3Re3cW6p2ZanPld03pv9glrMUsHjnooBc+I1ebtz0CU5WbcKsb5ZnRehSGnbUlfODSW2t Dtb6G6FkzRA/7nL96pPYCZ9H21RbUPDisIHVWHzKCegOlT5ARxA0DcZoZ0zpjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31E8716115; Wed, 30 Mar 2022 15:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22UFnaDB019078; Wed, 30 Mar 2022 15:49:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UFnafR019076; Wed, 30 Mar 2022 15:49:36 GMT (envelope-from git) Date: Wed, 30 Mar 2022 15:49:36 GMT Message-Id: <202203301549.22UFnafR019076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 708928f4db90 - releng/13.1 - net80211: improve one debug logging List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 708928f4db90483700aca98b8d3eb73b466e2024 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648655376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXXJjcDG9xteT1uYOfDL16WEpatfPqO6fXRcpINXCRc=; b=o/Y0eWvL5GKakH/7iGt4g3AAFKr0ecDj6JYpaV+32N0wMS8TZEyO3pTR/sNACoI0ceg4sP kcCxZXB9BcFSQ7RdsV3m63ZwAUZasJR4rFSnKAO6LGi+uK9Pg5ZcKDdaXwwIZBxpRmayyS MTJDtlVuwkiblfV5GiECOqBeo2/c4RsjgcO4XEooAFXn2VHohpE4DH3ByqfxEzCJAa8ig5 xwSSg6oOkYm/l+5xonzNA9/E8onjl8yd02Z872RIzbiQVJfDul3gA1c9VQ+zhR7oGzYQfL DLfTFKn6/sEbggWhmBhcbUbcVI6iLicG/2oJDx3gvEHTFIFxeR6QMOc0ovQ0mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648655376; a=rsa-sha256; cv=none; b=KUa+MzJjfV5BMjfXycAgR3XU1evKBy3842EENsBoWpbV5b+j7qMrYKj2CuOSWXpMRHqGl9 N1ezBZ9QjBk3QjS8Gd4PmEykv1NihTgbx9/HhHS14PnGb6uYnaUrQk+9fORqeXfLMTES5j 2q7ToCICrEbguZ/6kjiJ5zuvVBKRq4b/FsWdbWB93qXHxs1DA9TscIsyl/Ddy+7Mmf69Hs ifUyXWcOLI+/Kph/DGZrZJTTJEWIlBY+8sYRUsdD2KUUkEJYqKPU4uTlOQ1SCplCZ4VD1T /CJ30deJG+VNbW1VDvf7fUf3IJXSdGfRNBo0lgYzXamWDIDL17HNw7hLgEeNxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=708928f4db90483700aca98b8d3eb73b466e2024 commit 708928f4db90483700aca98b8d3eb73b466e2024 Author: Bjoern A. Zeeb AuthorDate: 2022-03-22 14:40:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-30 15:44:34 +0000 net80211: improve one debug logging When forcing DEUATH in ieee80211_sta_join1() log the current state we are coming from as well. Note this isn't always the state we are expecting as iv_state was updated already, so contrary to the comment we usually do not see RUN there. Leave a comment earlier with regards to this as well. Sponsored by: The FreeBSD Foundation Approved by: re (gjb) (cherry picked from commit 453d1a90f8f46637404adc0278d6f3f068542733) (cherry picked from commit f39c5ab3503cb963cc9f22b2bf82b5bc87a70e21) --- sys/net80211/ieee80211_node.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 2dd90eee83f6..3df534edfa55 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -851,6 +851,7 @@ ieee80211_sta_join1(struct ieee80211_node *selbs) * Check if old+new node have the same address in which * case we can reassociate when operating in sta mode. */ + /* XXX We'll not be in RUN anymore as iv_state got updated already? */ canreassoc = (obss != NULL && vap->iv_state == IEEE80211_S_RUN && IEEE80211_ADDR_EQ(obss->ni_macaddr, selbs->ni_macaddr)); @@ -896,8 +897,9 @@ ieee80211_sta_join1(struct ieee80211_node *selbs) * as a station. */ IEEE80211_DPRINTF(vap, IEEE80211_MSG_AUTH, - "%s %p<%s> -> AUTH, FC0_SUBTYPE_DEAUTH\n", - __func__, selbs, ether_sprintf(selbs->ni_macaddr)); + "%s %p<%s> %s -> AUTH, FC0_SUBTYPE_DEAUTH\n", + __func__, selbs, ether_sprintf(selbs->ni_macaddr), + ieee80211_state_name[vap->iv_state]); ieee80211_new_state(vap, IEEE80211_S_AUTH, IEEE80211_FC0_SUBTYPE_DEAUTH); }