From nobody Sun Jan 16 22:31:12 2022 X-Original-To: dev-commits-src-main@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 814EC1968C99; Sun, 16 Jan 2022 22:31: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 4JcVB83HDNz3D2x; Sun, 16 Jan 2022 22:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642372272; 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=1Wp60/+X+J/eP72WtwtVkmIW5PBfaWAKS7RqNkCmij4=; b=KzgChrXIqQ8i8v0wQewCm4t/OXkXxodBu0+WLmpPyz1Mtu/vc8GtNPKy0fY1kYbE87fEwL x3Nmg7W42vXSrj5eAUKfDEUM+lqaJZkq4AnJ2l3SgNn1XCyyyPzDzvf1fGKWkmHk0Qr3Fi n59qe1XImVuvKszcwdDRwGm8BERU3qRO/0Ofhyml4r6oI6Nf/zSSOKAKIJ3ixjUFsUoCq4 YU3XcQu6ZTujX9vx+rv6YoowET5mumGk20QbWO6G/2HPYdY/Dur3mdGCoZgHl6MhX8+Zlq MysQUB+0UMpKWsycVlsKSw7Ap/FM+U5ycpC/NaBg1d5rF1oY4LFV7m8T4velrA== 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 51D6E2288F; Sun, 16 Jan 2022 22:31: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 20GMVCck084038; Sun, 16 Jan 2022 22:31:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20GMVCwL084037; Sun, 16 Jan 2022 22:31:12 GMT (envelope-from git) Date: Sun, 16 Jan 2022 22:31:12 GMT Message-Id: <202201162231.20GMVCwL084037@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: d7ce88aafc87 - main - LinuxKPI: 802.11 correct enum ieee80211_channel_flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d7ce88aafc870944d5eda477b125478f56844f81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642372272; 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=1Wp60/+X+J/eP72WtwtVkmIW5PBfaWAKS7RqNkCmij4=; b=M+0LT4ilFDkWK0fRaZH8v8r+2AH9HMkkFUuqdzQgDRF0DbeSMlkEnszVrCjXOlm1uk+fv2 6F8CDWZf1H0Vwz0oWgh3q0qcguYSGGRY8sFOUai0u0axeRYcEdJi1rGsC082YKnXYjt4ZO kSgL14BJO94Pr2jdhVz2aC6+Mgd7jkx6xTQoUD4+LE1E5/hl/pzhOMObFTKGGxywI3RmCG q+tsK5M7MTs3O8Fe0nqUsCyag3ldxD+qoKHJCRQb9Omd2CubbfTK0XjKiTu7HvubHz5Ekj 3MUyTI89ZJZTqE/XVLlNvPpskbJ8vLxKky68f+sp9wO/pBbIWt81bDBhA2dUUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642372272; a=rsa-sha256; cv=none; b=nA8lYKCbdnjGfAwh3qwDZHgT+BRpJokYN+fLwrDBh1KYTeZXIyBYtW0A8iwOT262GQhBCc 0cXkHotm6aSZFWrQbJtyW6hZFQmvCna66gqYmhggHqrDRExW/E9/wnRfz/vo4hSl445Od7 nCj0iT4T4fluWxor8m6uKgR76ceMYYHd4rFn4taOTkzllXxJNcuCoehSEXoTNLSJMABc8s kyNDsixRrxHUmOvLGMY5/AJ1vYcp9XAVWOekfD+N5qZJ6YafKa+Z+MtT6djP9NxoRUUzYN 6SFr1jMGb450XZTtlCCVq2/4hI6D1OZWK4+vEBLs6Dy7R/D1nmWONuDDS/GkMA== 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=d7ce88aafc870944d5eda477b125478f56844f81 commit d7ce88aafc870944d5eda477b125478f56844f81 Author: Bjoern A. Zeeb AuthorDate: 2022-01-16 22:22:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-01-16 22:30:38 +0000 LinuxKPI: 802.11 correct enum ieee80211_channel_flags enum ieee80211_channel_flags are used as bit fields and not as 1..n. Correct the values using BIT(n). This is also hoped to fix problems with 7260 cards which come up and panic due to an empty channel list as all channels are set disabled [1]. It will hopefully also fix the one or other oddity. Reported by: ambrisko, Mike Tancsa (mike sentex.net) [1] Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index d0de3ec95086..8ec051e173a7 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -79,15 +79,15 @@ enum cfg80211_bss_ftypes { }; enum ieee80211_channel_flags { - IEEE80211_CHAN_DISABLED = 1, - IEEE80211_CHAN_INDOOR_ONLY, - IEEE80211_CHAN_IR_CONCURRENT, - IEEE80211_CHAN_RADAR, - IEEE80211_CHAN_NO_IR, - IEEE80211_CHAN_NO_HT40MINUS, - IEEE80211_CHAN_NO_HT40PLUS, - IEEE80211_CHAN_NO_80MHZ, - IEEE80211_CHAN_NO_160MHZ, + IEEE80211_CHAN_DISABLED = BIT(0), + IEEE80211_CHAN_INDOOR_ONLY = BIT(1), + IEEE80211_CHAN_IR_CONCURRENT = BIT(2), + IEEE80211_CHAN_RADAR = BIT(3), + IEEE80211_CHAN_NO_IR = BIT(4), + IEEE80211_CHAN_NO_HT40MINUS = BIT(5), + IEEE80211_CHAN_NO_HT40PLUS = BIT(6), + IEEE80211_CHAN_NO_80MHZ = BIT(7), + IEEE80211_CHAN_NO_160MHZ = BIT(8), }; #define IEEE80211_CHAN_NO_HT40 (IEEE80211_CHAN_NO_HT40MINUS|IEEE80211_CHAN_NO_HT40PLUS)