From nobody Sun Mar 27 20:14:14 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 CF7611A54611; Sun, 27 Mar 2022 20:14:16 +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 4KRRqq3HsSz4p3l; Sun, 27 Mar 2022 20:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412056; 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=zBFSQYLXBa6l/TKy38vYZBZDkDjcFgxsI7w80K/GyMg=; b=XXzmnFp8rLPwHIibgUdPoCIOkqpfouBbhB/VgEUV4o7CdnMZPfBrdyy39PG5hW/lvIcHnn VtSdcNfHsicQQtfvWwS0W6lXxE5IxMHVjjVdxcm2VEaS/XwTnLwxrXh9OrDaw7n220oJx7 861Md8eOGMolGk2sPhAm1VG2/rvGAT8tuXo4uldh1tIJtbdATf6qhGgwXgAC0/jS2YUree NaPgndI0pDVpoCxGXX1pA0PRN5X/geksWqQHkYprYRDdsEZs2ibvlJ6JCEzgeWOGzqso5e L/MD1D0WEdiX0NW8S0i9Cx+I5LijyrGlFP30YzC3rLtHg+h+OmsS6G5hy6OrkQ== 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 ECC241BBF8; Sun, 27 Mar 2022 20:14:14 +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 22RKEEB2037443; Sun, 27 Mar 2022 20:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RKEEKP037442; Sun, 27 Mar 2022 20:14:14 GMT (envelope-from git) Date: Sun, 27 Mar 2022 20:14:14 GMT Message-Id: <202203272014.22RKEEKP037442@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: 5f88604cf7d9 - stable/13 - LinuxKPI: 802.11: remove special handling for (*ic_scan_curchan) 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: 5f88604cf7d9df1edbc662c4278e01476534f3ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648412056; 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=zBFSQYLXBa6l/TKy38vYZBZDkDjcFgxsI7w80K/GyMg=; b=bhlHM9+aUsmlSgJ3oIrxacJA3w7Js6qCt8wHQtRsUsIowzaxEpfzzTjNjqwTR9e5cGn55r +IbmQRBg8IU2y2NBndWq4wVavoxCiRyt0LK5FH5Fez8V8ifSMgG1ODjJve8HLC8kIbTznL 9a7Ca/agLJMFTWMGjBPCYEzzXJcvEg02IeWYdGrxhd99UyXG4TGrcq/YDMNIRw5N2AN8jG tctg9ycEBLoQvfDM8YwPz5PtUqPZufzC6FD2QwKk6nHycmu75/FDc9O3KWvKYsgjUS6Z98 4hjsYamvA2n20GpgvoIGR2/AKGrqJ10D9yXj2/VLoVj8IBn4mhycwar1fD1Rzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648412056; a=rsa-sha256; cv=none; b=jaSWU/GBcz6ABtwMWdaugNMKh3jlDRg33MivKfsI/LpzdasSm/8jSsNDN0zE6lOCE4jWnL HuwRaYrhHQ19snQDFWNqaGQVBfdrOOVzpvZqcHEKaPHR7oOzaqP5/eSr3U6FI1NwT3d9lf SZVOF272fIyxfs4MUwvgg3M3ZvBhk9PWF4Be+AeFiLkMpPLHHAjmbzPpt3Oubrx+xqZl0N 8BslI4aHS+NhmY9mqWBJtM7MpXyaKipMJQnT4wBRg3yqa+dS+aT/xsM68SvAEppMOr/WDh izaCC9SWqiYzdgtiG2jccKYpivMg4F/GG64vDs3l6bvMM+MDL5c5OBvV4O3Tkg== 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=5f88604cf7d9df1edbc662c4278e01476534f3ef commit 5f88604cf7d9df1edbc662c4278e01476534f3ef Author: Bjoern A. Zeeb AuthorDate: 2022-03-24 17:32:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-27 18:12:36 +0000 LinuxKPI: 802.11: remove special handling for (*ic_scan_curchan) Remove the originally disabling of (*ic_scan_curchan), which for iwlwifi was not needed. The condition always only was approximate. A set IEEE80211_FEXT_SCAN_OFFLOAD will still prevent net80211 from sending probe_reqs if handled by driver/firmware. ic_scan_curchan will re-arm the timer to switch channels for drivers which need it (e.g., rtw88, but that again is a NOP for iwlwifi). So enabling ic_scan_curchan should not have further side effects for iwlwifi but allow other drivers to work better. Sponsored by: The FreeBSD Foundation (cherry picked from commit 321735f451d1eaa710a768d9e35ff87acb089d35) --- sys/compat/linuxkpi/common/src/linux_80211.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index e1e2bbe02a03..727c0e276af9 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2595,12 +2595,6 @@ lkpi_ic_scan_end(struct ieee80211com *ic) } } -static void -lkpi_ic_scan_curchan_nada(struct ieee80211_scan_state *ss __unused, - unsigned long maxdwell __unused) -{ -} - static void lkpi_ic_set_channel(struct ieee80211com *ic) { @@ -3373,9 +3367,6 @@ linuxkpi_ieee80211_ifattach(struct ieee80211_hw *hw) ic->ic_parent = lkpi_ic_parent; ic->ic_scan_start = lkpi_ic_scan_start; ic->ic_scan_end = lkpi_ic_scan_end; - if (lhw->ops->hw_scan && - ieee80211_hw_check(hw, SINGLE_SCAN_ON_ALL_BANDS)) - ic->ic_scan_curchan = lkpi_ic_scan_curchan_nada; ic->ic_set_channel = lkpi_ic_set_channel; ic->ic_transmit = lkpi_ic_transmit; ic->ic_raw_xmit = lkpi_ic_raw_xmit;