From nobody Sun Mar 27 20:13:54 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 B84D91A52DDB; Sun, 27 Mar 2022 20:13:54 +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 4KRRqQ4Nxmz4nkF; Sun, 27 Mar 2022 20:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412034; 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=jjxLHpzgUeb0bszAHq+7tneezj/gOUumNgNKNQVof3E=; b=oFcpAo9YxGn2YiiDD5/NMgb247GeblE/E1KO9Vix/A9527fUc0FIgKdkg0MfH/iA6jATgP gY0Ylm7epiJ3h4vF2ENP2Hp7/dpZsagRYPgSvEw/Hq5Z+7dBjdFAk5gk9wT2IVQHMnke8u iyjhKpe9FIORuHrZxIsZWY7SNfxN7Wl0gE/qysizmgtzSseNPiaVecrCTV5Lk/QgT9m4Rq bfIqOXwikaduJc5s1jfmOot711GJip5gTvRl70+sgPNKgmj3wfXhCyDtGnlQ/ms01w1JrE Iy8wUrJWntoVnUyZQBhGsIab0AdBDloh36Cj+B9Avllm0w7xijEp/4JjTrxizQ== 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 65B201BDCF; Sun, 27 Mar 2022 20:13:54 +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 22RKDsdv036990; Sun, 27 Mar 2022 20:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RKDspv036989; Sun, 27 Mar 2022 20:13:54 GMT (envelope-from git) Date: Sun, 27 Mar 2022 20:13:54 GMT Message-Id: <202203272013.22RKDspv036989@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: f39c5ab3503c - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: f39c5ab3503cb963cc9f22b2bf82b5bc87a70e21 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412034; 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=jjxLHpzgUeb0bszAHq+7tneezj/gOUumNgNKNQVof3E=; b=gItaMTgaA+l+26i1UWUMWXBlSQp0WFu/vw8nIWGx0nylTS81RRqs7vB9PTrq9Fk6tM/J5q uD+uI14PrVt5oH3b4rklBmNDr+BOVgVxwbV20BEv5topJ3iET5oEUucDHe/mIBBGdijjIv I0Ykp8WhdrVyTB6HKIL189A3culmgLZxp9kH/p4yAubog7NeOmHlIEM1dPKPAZSi3wjaye 1Q5N/vUFDG4MJkphy3V2y4nQemcCR7y3sbo6WYCD6di7sJj7WGIpFuxO1HwLFRwRJyPIKu TWGFC7o2WuiwpBq2Ha1zXcFwu+waXKfWbz11/EiXHHd+FFQjV2lCudruvgCM5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648412034; a=rsa-sha256; cv=none; b=JHJq4qe0nYCFXwYLVjzcPPBia42IofhrRzAvn9VGJKBAh+jZITogLG09pIjO1uWW5UbGCi qyXeP1BtPgP0UUtdR0P5JMiW1O+RK3EZ42WRIzYhjhPwx84kWtJ0JG4eGxJLGcfKDiae5r mHiC/sCOXmW9i/SFsxzsFQVrPnlLMET6RjU1wTaEIeirXa7JE8s4hl4mUxuauKVsmDQtNG 5BJeFRApein1ouydQrVBz4zH3imlZlaxnSscw6JqCcDfXN8IMgmfLCYeWdGg0zGQzb5Y8B 6a3WVj1P0dNYcnwdH/strP+L/fCDzoskoUPr2OQ9WDCfx7VgMtz9Ya77uA/41Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f39c5ab3503cb963cc9f22b2bf82b5bc87a70e21 commit f39c5ab3503cb963cc9f22b2bf82b5bc87a70e21 Author: Bjoern A. Zeeb AuthorDate: 2022-03-22 14:40:12 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-27 17:58:35 +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 (cherry picked from commit 453d1a90f8f46637404adc0278d6f3f068542733) --- 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); }