From nobody Tue Mar 22 18:52:47 2022 X-Original-To: dev-commits-src-main@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 944711A299ED; Tue, 22 Mar 2022 18:52:47 +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 4KNLG73pSvz3scb; Tue, 22 Mar 2022 18:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647975167; 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=hDm0kpyABQY+dlDSqcCmPwc8zVkauh3ZEzwlM1p87+g=; b=KY3jtQtDlpxUMuej7YH5Toq0IBbEkWhEftG3x9ScCCtpfdm5OVI6uQqSBUmPI8c7GXsYs6 RtcAiNPe7wzYwzBAovuy2hv4bPCyo5/hrH6eGhLfxWXt4aLu65byAjNNYxHuTH1WGTP6WW 4JwJmuoHiBo7jc4NazQXuhJ1OymtZSxVIWYIGaSVBErJymaweRYu8QmC+HqdZYVB28+0r/ Gxz7HGE87Zfe9M5tP5u2eeJNAtPepGSbX4GFo1KFxm3iyshyNNLlgTABb9tLEtptVM+lnJ pMtqp6y5es7bbU+HuwT3pgDeDyoQH/2pX3wF82z0C2tN+YBeO2wbLKNcRj4R8g== 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 6271B14FD1; Tue, 22 Mar 2022 18:52:47 +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 22MIqlSK099334; Tue, 22 Mar 2022 18:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22MIqlTx099333; Tue, 22 Mar 2022 18:52:47 GMT (envelope-from git) Date: Tue, 22 Mar 2022 18:52:47 GMT Message-Id: <202203221852.22MIqlTx099333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 453d1a90f8f4 - main - net80211: improve one debug logging List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 453d1a90f8f46637404adc0278d6f3f068542733 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647975167; 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=hDm0kpyABQY+dlDSqcCmPwc8zVkauh3ZEzwlM1p87+g=; b=M+4yYQ66LLm03KlcXbljaEZB6b8ewQbv6KMXXzUJg+HLcXMIJG87ebWSriA7zHVlmNxecC B0K8hqxADTd141uKZTpFMzGSNxAjyjNhnpwwJRc0mjRkjpn4r1OtDHpjRNPU/MuYjoEgHd 5BKY2E2qOdGY2WzQS7gijS7zijshsJ68VdJ7lCXdNjJXjI/WtdcWY8yEoF0/IfiipH2Yi4 cKfylHaZni+FTm2WY+vx7fK9ubns1sOHKajirdgMCKY+TRJ0gm9VBBXByh+Hxxm7inPvyU KmAUmWy+7hIQtLPKmaZRgnQsDIyc9CNdN94zMwKxNTvXpHcGj55iJNVPJ0QVEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647975167; a=rsa-sha256; cv=none; b=cBVwuLL9NUucGgOp+P8/x3oRxY6erhcTlopXF0cdPK/nMy7PU3nW7egZ+Fs2zfnT25ks9s 1+ZFVt8c5BZjb1JdrvX4ayOodja8TWmbwQG6oAZuIPue/M7uFNb8G573DztTRiMD16L+AF JAsLkTjypNMsMM8GHuxTbEuYADo4oZHyF0s7wUa+88d+10A0toThLDJ37+38oJkCsQBibu twAq2I9iSumdsX97p6gfefnaJ4dvwxZoXD6BQRCgkLqcaNL2FSZ5ZfcGR/ug3ub1itRoDd SXJXPVv4ZEzIEO2RtyzXHddSnhgVWxVk2Jpkg2UANfqDcAaRwuxNgSQmHnIt4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=453d1a90f8f46637404adc0278d6f3f068542733 commit 453d1a90f8f46637404adc0278d6f3f068542733 Author: Bjoern A. Zeeb AuthorDate: 2022-03-22 14:40:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-22 18:51:43 +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 MFC after: 3 days --- 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 3ee46df2a570..43f90f860a2d 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); }