From nobody Thu Jan 20 14:46:17 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 B711D195275D; Thu, 20 Jan 2022 14:46:19 +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 4Jflgt3BGpz3Nr8; Thu, 20 Jan 2022 14:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642689978; 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=K9w42QGP/euh0Gt+xZCzWewsKfFaWKc+3w1rIzuUXSA=; b=Iv+QhIn8f4gwX+6jHOph5q2xDFVuNVJDnBscZso6PBLIGSM1+djx1+KeuNNLSdBfpyCFuI zcVMR9jNanx2ShtixphfEcWamdxRC+Gtc0aEvO1RoJbuuxZtr8xtWOkq1CtA0RmIal5qk+ HHMU7nx8Zd/EB6h2d6hlC4tNlDkiQOQ9ka3TLGBsTdAJooFJxUQ/qaan2lLR0bW/QlZasA fVQcHDJpdXtKEDCmI+Ao7RLye+zupbuxhY26uvdlLAaKU37dnwFoYb2y8bvxdn/yN8QWrG aTReI13UYAlstnAFxshux6yBQbkNzT6wo6OZDor9w8QN4CRhqSwaYRgQPnPgsA== 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 DB4B71FAB; Thu, 20 Jan 2022 14:46:17 +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 20KEkHcA064896; Thu, 20 Jan 2022 14:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20KEkHni064895; Thu, 20 Jan 2022 14:46:17 GMT (envelope-from git) Date: Thu, 20 Jan 2022 14:46:17 GMT Message-Id: <202201201446.20KEkHni064895@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: bb53dafe145d - stable/13 - LinuxKPI: 802.11 correct enum ieee80211_channel_flags 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: bb53dafe145d47d77a306d676544634dd4416b47 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642689978; 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=K9w42QGP/euh0Gt+xZCzWewsKfFaWKc+3w1rIzuUXSA=; b=e7uJYU/9J2+BqT2XM0oy4HznRNOsyPhQgfmlezQlPg8I3lxqv/wxF8wuhawmFgZz1YBkRk /gx4xMjZHiUwcdvKRd/uPi128NiO3VbVZ/xDsAJXvNt1tV/OfRLKjyf6tNkYV700L1z8Me VjL+e/gEm+Ox8d638cT1oOuaJ6IfznQkErxSZGfNmurK0cnXu6/4EwBXjN634/MDWEu+iE zy/h5suy8g3YjYjQTQS0HCN725CPermrOqFn7SEWk3DEEaL427cW2xmh2ere8Yyi0fIqAA 4Ur5XdVYMsl1sQCBq1QPiuWnzShuFNn1A6oLor1tgVzlIl544CFhXVw/N8i+OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642689978; a=rsa-sha256; cv=none; b=LHFHjo5Dua101zbpPs11V4iHN2kMO5OIPjUJA0TV9c0gmMA5nusv2O5yQBzbac4CZ+EosT 4ciSdL9a6v5ar1kDRwUapN5Gupah5OhjYHXMCQ+ChB3gXW4oqpx7aGUaTSeJ1rqY4EdAsZ kIWk0iRePKlzJkEJShVJ9yzColIwlOCDdVTMPa9bMQCWue493LL2fn+ymui5DnPP+wOCvO DPbNsA2nrA3TD0pn5mDCIW9++g+1kwIGmfoag05/vhfYgABCiq33EoyBaLl3d951BW+eYS Yq5iBlt8/bALFAG/dNt/+MZ0zquU8vb8TQ+EdpM6WWBkkEW+puVyuJ8A9P5/rQ== 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=bb53dafe145d47d77a306d676544634dd4416b47 commit bb53dafe145d47d77a306d676544634dd4416b47 Author: Bjoern A. Zeeb AuthorDate: 2022-01-16 22:22:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-01-20 14:05:37 +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][2]. It will hopefully also fix the one or other oddity. Reported by: ambrisko, Mike Tancsa (mike sentex.net) [1] Confirmed to fix by: ambrisko, Mike Tancsa (mike sentex.net) [2] Sponsored by: The FreeBSD Foundation (cherry picked from commit d7ce88aafc870944d5eda477b125478f56844f81) --- 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)