From nobody Wed May 4 15:18:12 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 C6EC21AB12D5; Wed, 4 May 2022 15:18:12 +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 4KtgSh527zz3s0j; Wed, 4 May 2022 15:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651677492; 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=Uj4MzjWgPrUcsdG9PYK/A+X0LN0M3tjH37pwYKkQ+OY=; b=ECpzv3GQctK70ZcSslfxqy9nczPXC7yQuOPTYEAhz8Xl5Vp3xqiCcdAx6YsfXNtWuvH/KU PfqhU/ZawkTl2noaWQFrMYT7eenAh0+yzAZFzf10J5Y6Ncwsb7n+HEey/mQBlssbny9QeY dUhXKF8zFfQcmV4L/bHkty1YRztcg/b5WZG0xpFMcKVD6bRy3HYYaZeZAkS5OMdk5FpjRM 06VIlzeQhhaFB+J+Bkuj2P0EqxmKvaYVnhGV+Qyb+iciC37ljTA0X4vmw+nuTQMejI2CBa 5mpApUGB8aUuPzObvvBSJtyxVBIFecqZ6opeCajjBbIF8XUBDib5PJolvnKc7g== 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 7DF3A155E1; Wed, 4 May 2022 15:18:12 +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 244FICg1020272; Wed, 4 May 2022 15:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 244FICg0020271; Wed, 4 May 2022 15:18:12 GMT (envelope-from git) Date: Wed, 4 May 2022 15:18:12 GMT Message-Id: <202205041518.244FICg0020271@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: 1a86fec11b00 - stable/13 - LinuxKPI: 802.11: use ieee80211_beacon_miss() 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: 1a86fec11b006d5e3f80c37a90b46f1dc95ba236 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651677492; 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=Uj4MzjWgPrUcsdG9PYK/A+X0LN0M3tjH37pwYKkQ+OY=; b=at5UrSZsO41iboNq5rs3f6Osy0y5/FLHDk86wT6nxsriu5gEzZ5t00R3nH0i/Gb8BADYsm +2g1HU3QrZzrW9TVK9sKMs4D71p220Goqk0Awfgd99aksc17fLozneewzD+BcT6LK6dR92 0srAdzWZRxBbZdfYNgvMOoJASAlK5fumNvLET+N6WujqX8xgN16b/mCb8RgGz2L9n4ZaTf 7rQubG/yjtcaNovXcZffYiWWrXnopi7hqRG7CrgrUm2QCgBbfUXnIA9Z9tsG4NM9eFctSz /E0/HVpkomK9K869cmMjwCyIaINrqoialdeFNUprsqr3DDZLYr3e17gmv5TKVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651677492; a=rsa-sha256; cv=none; b=OP5PMXbZiMzNe1eh+l09SAKHjy/kU6FdmQtxGDsfGl9rs6YZupc40ntYAZpHUA5VqQGgSs PX3dG2K/iJ5APnZAa5NaTYJ5z8klCgUZYoN8/ADx8ssgeNMuJo9ayvE1cOs9fm2s+1sA5H 9ivTjcAG3De2gOfSogB+y3ZVhdA6O5HkMWCfXd6aWSuRNXuCu19oy/qXHY1N3FHfSyZktk paFSCnhZcNti5DYj0J1tyCr6qcN/dI4Obn3gWaO573wqAVIiTpP13bTL8CuqCagG3S7UPk h9n+myneN6R5LfxJ21LPstYcj2+04NrdW2KnjolmzO7uI7Soqr9Rgd1ehf4LTQ== 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=1a86fec11b006d5e3f80c37a90b46f1dc95ba236 commit 1a86fec11b006d5e3f80c37a90b46f1dc95ba236 Author: Bjoern A. Zeeb AuthorDate: 2022-04-30 07:57:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-05-04 13:13:06 +0000 LinuxKPI: 802.11: use ieee80211_beacon_miss() In ieee80211_beacon_loss() call into net80211::ieee80211_beacon_miss() rather than manually bouncing our state. That should give us the ability to send a probereq and see if the AP is till there rather than right away going to scan. Sponsored by: The FreeBSD Foundation (cherry picked from commit 3540911bfdd83ce69d1c436f6773becefef403fa) --- sys/compat/linuxkpi/common/src/linux_80211.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index b80d8b62087b..27141829839f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -4459,27 +4459,16 @@ linuxkpi_ieee80211_beacon_loss(struct ieee80211_vif *vif) { struct lkpi_vif *lvif; struct ieee80211vap *vap; - enum ieee80211_state nstate; - int arg; lvif = VIF_TO_LVIF(vif); vap = LVIF_TO_VAP(lvif); - /* - * Go to scan; otherwise we need to elaborately check state and - * handle accordingly, e.g., if in RUN we could call iv_bmiss. - * Let the statemachine handle all neccessary changes. - */ - nstate = IEEE80211_S_SCAN; - arg = 0; - - /* We should be in RUN. Can we assert that? */ #ifdef LINUXKPI_DEBUG_80211 if (linuxkpi_debug_80211 & D80211_TRACE || vap->iv_state != IEEE80211_S_RUN) ic_printf(vap->iv_ic, "%s: vif %p vap %p state %s\n", __func__, vif, vap, ieee80211_state_name[vap->iv_state]); #endif - ieee80211_new_state(vap, nstate, arg); + ieee80211_beacon_miss(vap->iv_ic); } MODULE_VERSION(linuxkpi_wlan, 1);