From nobody Fri Jul 29 18:48:35 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 4Lvc3l6C1Zz4Y24Q; Fri, 29 Jul 2022 18:48:35 +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 4Lvc3l5ZVkz3tBv; Fri, 29 Jul 2022 18:48:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120515; 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=2ltuYyrYKDgDvDVKzkTdMays0RlHoSpYXvegi7GsjEQ=; b=qhCXt+tzBUPiiecCaUxkNwXp1Rxgetn+Elj8dwG5P3eJ9AlxPF+OOtOwWbaA55QJNAf9Zx /XirMn7LwZk5mUAjbgtSstEMArjZOY5qHiuNwAmla6NdE/Kt7yeY854rMZMdQ7FBYoxO5X hE4ZhSlR9PeUZlTLHm1BA6aO/b2d1GtYnRo2mQNcktZu620nJJgUFwFz4rK6hcKbh9up75 hcWg/D1PjPjFZJfLh2GJnjno6jWhsl7BW24xvOnAW8zs4O7vgMETgK5LVLQa2Y6NzsdqbQ 7ieQdZwk6rTq20EGi+P7Pgam1ZkTV6rO+T6dTUCDw0xhXtqxRf/ret7yKhijkA== 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 4Lvc3l4ffFzlvr; Fri, 29 Jul 2022 18:48:35 +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 26TImZL3025574; Fri, 29 Jul 2022 18:48:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26TImZwc025573; Fri, 29 Jul 2022 18:48:35 GMT (envelope-from git) Date: Fri, 29 Jul 2022 18:48:35 GMT Message-Id: <202207291848.26TImZwc025573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 22bc126280d9 - stable/12 - Fix unused variable warning in ieee80211_proto.c 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: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 22bc126280d97af0f0353b7d4e550293d3d0c1d6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659120515; 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=2ltuYyrYKDgDvDVKzkTdMays0RlHoSpYXvegi7GsjEQ=; b=YESmsFdT7tLXlhSxyH/0Y0+h1kYKw1Ug990Ww6pL7LmhOM0g1U0hFm8WlMLWwR/g13I/pd 2OymO2MMRoTu1L2OfySoeUvUNbOsQ2r/eYnfVeVaIEyT5TgnL6V6QdFPCFbEYcMkq7VdNx ATw7q/fzMMsLN4EHQSt30zVXMgdY345TIbFNSXgWBl5rWJb9zSF1rKcojlEpeKJZ8DgsCv EKAxW1cef+kKfvA6CnTprdpzDIKjeB6oVW+LjzNzB7w0fPOUxNaNqDtAJJmAcOAyfGyKRh UKG127qBP/EunxMLSg0RpGUS7ciD7f/0A1dxNxOxXW7cmUSmgck4obNsyfIjaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659120515; a=rsa-sha256; cv=none; b=sUgqi1cjKDz62AkmUQVog4qMjqo2jcq0Vafmnfa6aidYYMps9GPNH42LKohq7dlb9TQcez /egA2bAExAtDgfXXWyV6dTe1olhoKvSsT6gmSjjXfkItME5SD7qGVagBkXcVfH+cleYYCl H53umOfRsw62dzA1YUyl7S4Ruw0rlfhT7InY2nYC6iFYp48W6IovJyz17quQLhxkQU8iEX pvaHa8FrKOYEnp3L1TFLo20N5pA3INNQtVwJ9R7AovwFGDrkJ45WOeKJJJKyV6ZsbOcujW iLZt08Rt4nvPk386xiArf4BOV95NTjMYL0kIhF0UzuXgOJy8XxpA2mcTJxYE0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=22bc126280d97af0f0353b7d4e550293d3d0c1d6 commit 22bc126280d97af0f0353b7d4e550293d3d0c1d6 Author: Dimitry Andric AuthorDate: 2022-07-26 19:05:36 +0000 Commit: Dimitry Andric CommitDate: 2022-07-29 18:37:15 +0000 Fix unused variable warning in ieee80211_proto.c With clang 15, the following -Werror warning is produced: sys/net80211/ieee80211_proto.c:1070:34: error: variable 'num_mixed' set but not used [-Werror,-Wunused-but-set-variable] int num_vaps = 0, num_pure = 0, num_mixed = 0; ^ The 'num_mixed' variable was in ieee80211_proto.c when the function vap_update_ht_protmode() was added, but it was never used for anything, so remove it. MFC after: 3 days (cherry picked from commit 9319211f96c6f11959c76f1d565a744ab37b0031) --- sys/net80211/ieee80211_proto.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 2f98deea88d9..65d1b2900ac1 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1054,7 +1054,7 @@ vap_update_ht_protmode(void *arg, int npending) struct ieee80211vap *vap = arg; struct ieee80211vap *iv; struct ieee80211com *ic = vap->iv_ic; - int num_vaps = 0, num_pure = 0, num_mixed = 0; + int num_vaps = 0, num_pure = 0; int num_optional = 0, num_ht2040 = 0, num_nonht = 0; int num_ht_sta = 0, num_ht40_sta = 0, num_sta = 0; int num_nonhtpr = 0; @@ -1095,9 +1095,6 @@ vap_update_ht_protmode(void *arg, int npending) case IEEE80211_HTINFO_OPMODE_HT20PR: num_ht2040++; break; - case IEEE80211_HTINFO_OPMODE_MIXED: - num_mixed++; - break; } IEEE80211_DPRINTF(vap, IEEE80211_MSG_11N,