From nobody Wed Nov 29 16:38:41 2023 X-Original-To: dev-commits-src-branches@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 4SgQ4f23lxz52x16; Wed, 29 Nov 2023 16:38:42 +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 4SgQ4f14jmz3KSS; Wed, 29 Nov 2023 16:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275922; 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=YZnJp/qwrQa2EcrtURDGvd1QfR26ecdaEyLagyp6PIs=; b=gCyllUSZD1Oh0G/48aKf8i8cVcVIozQrdDwOMxpzxnucwH9/+XqP2luXz/oDX741J6bDmj 6DoA0n5sQQ6lpbUFJHVuOf7p0ipaWgXKp16kNXiuMOOzPwjkOo+bHwuixosK3gyc4aMTYL vVuug4ya9ofWQBKESQQhBgaxHIqBg0OtJ1QBa7J0VuY9Lbt1AS71mtTGgv/rMK409fWk6S XuzbpW8fesfbvYpEy77O5Jmcx2ZbBM2sixa7HGTQH69edhthO0f1NDGafKCHtJYtb/SN6E +/U00YZ5RkHEnap474lGr6RHgKE5kDqB/6Nw0qj6uEdUwomOiUyrRWB25N1Ubg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275922; 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=YZnJp/qwrQa2EcrtURDGvd1QfR26ecdaEyLagyp6PIs=; b=OZFd5uj/XhCSWyhf13SFg584dnPk2tD4ptEUgjgSdPgIYQUnrrKzExtavQVIDy/yPcEHe0 E6YB8Il+U9Ks71zBzT7l1/B3J9TNGZrEzdT59aPEh22df0ZxcoCmA9RF9BTS5nAWoWQruv WxaGqTvSXtIpLXAI8Xyztn1PYdq1rumC3Z2IYnImPY8WewnmLRTuGCTc3XQWPi4g+xP43g t/YT80UZGB8hnoS6ldCP4s1b4vmPuu8prIeGRfoq5liiKk4hXQXKKHpEoL0hsLe1uA6Sj0 v6P4byOXwzzFhLNdiYW25rc9aEJ498mvc6cMOszjbYwjxmQ4aH1hNMD+yE2dKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275922; a=rsa-sha256; cv=none; b=J9C1Qpa49KDnogM9Wf+aJOdHVisLqv8ctHYPEZ9+utl/itfq/UL/lhOHrujc1uKXMpKh4c 1GDUmd+9Fb6fbcMZaoQSnujuZj2LcJzgHvbxVnphXlp99OuMAODHpi1o9Ywl1sa7/Zxckk CCYoJk7l0J0Tg2wBK8B2mhy6GSDg7qCv6sD5tTBKKt0rnivc2seDHly06FisRf42pmir28 u5BQ5s6o3uo8Yxj6lMbGx8yReWyb2aMBIClg2tU1hqQ9+6hPFMG1LWxiTCDqq1Ru0gMOFx 0XeKgSJw5NSRbZxYIIpCeYcbseq9S5qf7jQib8IonMby/qzZk2NR103lLabD1g== 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 4SgQ4f03Q1z1Cb3; Wed, 29 Nov 2023 16:38:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGcfpc046546; Wed, 29 Nov 2023 16:38:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGcfCG046543; Wed, 29 Nov 2023 16:38:41 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:38:41 GMT Message-Id: <202311291638.3ATGcfCG046543@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: 745bba174efe - stable/13 - LinuxKPI: 802.11: fix re-creation of VAP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 745bba174efe9f6bb4efbeb9643046acd0f6f732 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=745bba174efe9f6bb4efbeb9643046acd0f6f732 commit 745bba174efe9f6bb4efbeb9643046acd0f6f732 Author: Bjoern A. Zeeb AuthorDate: 2023-10-03 21:14:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:10 +0000 LinuxKPI: 802.11: fix re-creation of VAP After dbf7691999abe (as indicated in that commit message) EEXISTS errors may be seen. From current investigation that is due to the single-VAP support in LinuxKPI 802.11 and the related calls to mo_start() and mo_stop() and them being disabled in ic_parent() currently. Calling mo_stop() in lkpi_ic_vap_delete() seems to fix the problem and new VAPs (wlan interfaces) can be created again after being destroyed. Fixes: dbf7691999abe ("improve lkpi_ic_vap_delete()") Sponsored by: The FreeBSD Foundation (cherry picked from commit 6c38c6b1b917957d420902213f318bf0153214f2) --- sys/compat/linuxkpi/common/src/linux_80211.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 85965493e5ef..0a673a313c1e 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2481,6 +2481,9 @@ lkpi_ic_vap_delete(struct ieee80211vap *vap) lkpi_80211_mo_remove_interface(hw, vif); + /* Single VAP, so we can do this here. */ + lkpi_80211_mo_stop(hw); + mtx_destroy(&lvif->mtx); free(lvif, M_80211_VAP); }