From nobody Thu Mar 24 18:03:41 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 24C591A3EFEE; Thu, 24 Mar 2022 18:03: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 4KPY4Z0B1gz3QXc; Thu, 24 Mar 2022 18:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648145022; 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=wFJ0ef+OvR2TazDHP9tNOnpBDT0FOvAr4CILP/y7zZ4=; b=oivqSOKpsgObflS9iA0kZjGTrflp7mOA7mqgdBsNKXOchvkjz1sxxwWpS0CVm+PosLAd5j ICFX1uaEX0gGTFhYQMd9T43VvtnyBQ2JD+WmETKeoL91HBTGKL5b8QAidSpMY/1HWqcD29 OMq3xnZzfEkIFjkTMahkHn/dNJ2afq4I9oqP05xqwlPfeWK7+iIIiIfE72VqaMLdDSqO4B YSL7py6L8ooIgZwjh27SzJqU8G7HC0bmHaKEW8SxtxWzooG1mhYLjoQ40NDkp9kbcq9tNn YtVhC1izRHUpq3HLAEngR3ef4wHsgkqEFrsmE90WYezhWXmXFs3FplOet1W6tg== 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 D90C01CB3E; Thu, 24 Mar 2022 18:03:41 +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 22OI3fEs027436; Thu, 24 Mar 2022 18:03:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22OI3fuL027435; Thu, 24 Mar 2022 18:03:41 GMT (envelope-from git) Date: Thu, 24 Mar 2022 18:03:41 GMT Message-Id: <202203241803.22OI3fuL027435@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: 321735f451d1 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 321735f451d1eaa710a768d9e35ff87acb089d35 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648145022; 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=wFJ0ef+OvR2TazDHP9tNOnpBDT0FOvAr4CILP/y7zZ4=; b=BY7owy1QgDkQs/OONLEh59ab6MXN/hwg8zvTfVxgQN7F/1j86MwUzSvYSgjpi/3AuFjgfx lux94aMetLV60UOmUyuFeW4jEAPlbzy2n0Db2wh4mmL2eVVwWkvslztRx9iU1bSePHJ4+P o/9cNLvQgRCmdew3iC4Q0CXdPh9PSutS3y+dA/a7kgQPNLkdN4HUx3riTUykc746EWWonG OwJcqJR0fL7Vqla53dk/j1/x16HV6F2bVHJ7lfIKTADsLiynSzYWukr2NxfoCl33MfGrc3 Yb3TMEeJfkHxCK3D9nTcRA+kniTmCMzQhmZP0IXejvg38NaUsvZHmpAmHtbZXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648145022; a=rsa-sha256; cv=none; b=ydd/AA/dU3IcdLgNeEoQCErkwx0EcLOSns8qKuXXyXsWIBy8H2+i0Hne49MRv/P9jv1Fqb C/0NRXGyrmjvU7lOB9EGziPc2cUgK42aJxcuWiAxW120mlyOsCSV4mU8Hz07T0VlMA7NH+ Q1pTLxSyYPxToOhyU/oFvVVwxQGYoZ0p+rV6sq/AG5PUJwpgxJsbGXMPr0OV7QMHRyYsHC /TQDGhFOSxzeSNJd3YmUirNs9+TFH1+xry26yBglxPnnVK+CxUGulBnT0BMTIBTmVj2w6a ElpwtlHhOUnngoklj9KVAH9nYXYFSkGFlHEBwSi3ei/1p6+4WwreWldC4JK1jw== 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=321735f451d1eaa710a768d9e35ff87acb089d35 commit 321735f451d1eaa710a768d9e35ff87acb089d35 Author: Bjoern A. Zeeb AuthorDate: 2022-03-24 17:32:07 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-03-24 17:32:07 +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 MFC after: 3 days --- 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;