From patchwork Mon May 15 14:45:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 1781469 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=YRJQP4lc; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=t-8ch.de header.i=@t-8ch.de header.a=rsa-sha256 header.s=mail header.b=k5mG/F2U; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QKj056sYLz20db for ; Tue, 16 May 2023 00:47:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=FRWgBlohiQ9DHrYAZRO17MKJok/Aw4LGIjHGGZOP2WE=; b=YRJQP4lcDV4hL9 ogDGCAUpKqLrbt6IotH3Akw8I58c1tPnPfhNwxxP7mLilTsBzwAMkuSdpvjtIsip0kPNJPBnOrrF6 gZZ6caKbei1WRvfjx6PnxxQwU3FF6z5rFjegfxFFT6HBnNb+5YcPWeCfHMDa1AhmRMusmlQzKKEuU JnaFt5irxoEYvYfqHIWTGrJ7+S+Ejxh4qsnD9To04D1Q9IbmmBeFEm/07COMSz/ZV/yxNPsxhcm6i RPaGqIlWsyiB2ojWJZ5XYIB4Veb4M0y+7EfekZTrrcJ6jbrxtZ/PUgEUBV4TzNjJLllJyvA14FeHc GZKWAsTN/JKbqWWLI1pQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pyZSl-002S9o-03; Mon, 15 May 2023 14:46:11 +0000 Received: from todd.t-8ch.de ([2a01:4f8:c010:41de::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pyZSd-002S7z-1a for openwrt-devel@lists.openwrt.org; Mon, 15 May 2023 14:46:08 +0000 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=t-8ch.de; s=mail; t=1684161957; bh=mp4DRcijKNXE5XI12tUheg/Cp5sQSNGvpmJU2GXHCvQ=; h=From:To:Cc:Subject:Date:From; b=k5mG/F2UXL7+1zsj56Qz7IyI6xkrhOko108hqEtxWFQ/KpsyWxRcHUfPK5ZFHUKoy /AG83nSNJUO9lxQvLNlgrnn+7HYNwAqNuosvGtNaB9B0VA89y8nUdHQh1fH9BsB/QI wXJ18jS9FUZe1TJAoHqDkffmjGtAzPBvc8KtO1xc= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Subject: [PATCH iwinfo] nl80211: constify a few arrays Date: Mon, 15 May 2023 16:45:30 +0200 Message-Id: <20230515144530.1628647-1-thomas@t-8ch.de> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230515_074604_011397_4999BE60 X-CRM114-Status: UNSURE ( 8.87 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__Signed-off-by=3A_Thomas_Wei=C3=9Fschuh?= =?unknown-8bit?q?_=3Cthomas=40t-8ch=2Ede=3E_---_iwinfo=5Fnl80211=2Ec?= =?unknown-8bit?q?_=7C_28_++++++++++++++_1_file_changed=2C_14_insertions=28+?= =?unknown-8bit?q?=29=2C_14_deletions=28-=29_diff?= =?unknown-8bit?q?_--git_a/iwinfo=5Fnl80211=2Ec_b/iwinfo=5Fnl80211=2Ec_index_?= =?unknown-8bit?q?50bb8f03c2fd=2E=2E2a5e461e8d90?= =?unknown-8bit?q?_100644_---_a/iwinfo=5Fnl80211=2Ec_+++_b/iwinfo=5Fnl80211?= =?unknown-8bit?q?=2Ec_=40=40_-1249=2C7_+1249=2C7_=40=40?= =?unknown-8bit?b?IHN0YXRpYyBpbnQgbmw4MDIxMV9nZXRfc3NpZF9ic3NpZF9jYihzdHJ1?= =?unknown-8bit?b?Y3QgWy4uLl0g?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-0=2E2_points=2C_5=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Signed-off-by: Thomas Weißschuh --- iwinfo_nl80211.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) base-commit: b3888b29535a92584524e14aadf25fcb85e7fed2 diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c index 50bb8f03c2fd..2a5e461e8d90 100644 --- a/iwinfo_nl80211.c +++ b/iwinfo_nl80211.c @@ -1249,7 +1249,7 @@ static int nl80211_get_ssid_bssid_cb(struct nl_msg *msg, void *arg) struct nlattr **tb = nl80211_parse(msg); struct nlattr *bss[NL80211_BSS_MAX + 1]; - static struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = { + static const struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = { [NL80211_BSS_INFORMATION_ELEMENTS] = { 0 }, [NL80211_BSS_STATUS] = { .type = NLA_U32 }, }; @@ -1373,7 +1373,7 @@ static int nl80211_get_frequency_scan_cb(struct nl_msg *msg, void *arg) struct nlattr **attr = nl80211_parse(msg); struct nlattr *binfo[NL80211_BSS_MAX + 1]; - static struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = { + static const struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = { [NL80211_BSS_FREQUENCY] = { .type = NLA_U32 }, [NL80211_BSS_STATUS] = { .type = NLA_U32 }, }; @@ -1550,7 +1550,7 @@ static int nl80211_fill_signal_cb(struct nl_msg *msg, void *arg) struct nlattr *sinfo[NL80211_STA_INFO_MAX + 1]; struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1]; - static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = { + static const struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = { [NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32 }, [NL80211_STA_INFO_RX_BYTES] = { .type = NLA_U32 }, [NL80211_STA_INFO_TX_BYTES] = { .type = NLA_U32 }, @@ -1563,7 +1563,7 @@ static int nl80211_fill_signal_cb(struct nl_msg *msg, void *arg) [NL80211_STA_INFO_PLINK_STATE] = { .type = NLA_U8 }, }; - static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = { + static const struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = { [NL80211_RATE_INFO_BITRATE] = { .type = NLA_U16 }, [NL80211_RATE_INFO_MCS] = { .type = NLA_U8 }, [NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG }, @@ -1662,7 +1662,7 @@ static int nl80211_get_noise_cb(struct nl_msg *msg, void *arg) struct nlattr **tb = nl80211_parse(msg); struct nlattr *si[NL80211_SURVEY_INFO_MAX + 1]; - static struct nla_policy sp[NL80211_SURVEY_INFO_MAX + 1] = { + static const struct nla_policy sp[NL80211_SURVEY_INFO_MAX + 1] = { [NL80211_SURVEY_INFO_FREQUENCY] = { .type = NLA_U32 }, [NL80211_SURVEY_INFO_NOISE] = { .type = NLA_U8 }, }; @@ -1760,7 +1760,7 @@ static int nl80211_check_wepkey(const char *key) return 0; } -static struct { +static const struct { const char *match; int version; int suite; @@ -1817,7 +1817,7 @@ static void parse_wpa_suites(const char *str, int defversion, } } -static struct { +static const struct { const char *match; int cipher; } wpa_cipher_strings[] = { @@ -2099,7 +2099,7 @@ static int nl80211_get_survey_cb(struct nl_msg *msg, void *arg) struct nlattr *sinfo[NL80211_SURVEY_INFO_MAX + 1]; int rc; - static struct nla_policy survey_policy[NL80211_SURVEY_INFO_MAX + 1] = { + static const struct nla_policy survey_policy[NL80211_SURVEY_INFO_MAX + 1] = { [NL80211_SURVEY_INFO_FREQUENCY] = { .type = NLA_U32 }, [NL80211_SURVEY_INFO_NOISE] = { .type = NLA_U8 }, [NL80211_SURVEY_INFO_TIME] = { .type = NLA_U64 }, @@ -2204,7 +2204,7 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg) struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1]; struct nl80211_sta_flag_update *sta_flags; - static struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = { + static const struct nla_policy stats_policy[NL80211_STA_INFO_MAX + 1] = { [NL80211_STA_INFO_INACTIVE_TIME] = { .type = NLA_U32 }, [NL80211_STA_INFO_RX_PACKETS] = { .type = NLA_U32 }, [NL80211_STA_INFO_TX_PACKETS] = { .type = NLA_U32 }, @@ -2231,7 +2231,7 @@ static int nl80211_get_assoclist_cb(struct nl_msg *msg, void *arg) [NL80211_STA_INFO_NONPEER_PM] = { .type = NLA_U32 }, }; - static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = { + static const struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = { [NL80211_RATE_INFO_BITRATE] = { .type = NLA_U16 }, [NL80211_RATE_INFO_MCS] = { .type = NLA_U8 }, [NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG }, @@ -2413,7 +2413,7 @@ static int nl80211_get_txpwrlist_cb(struct nl_msg *msg, void *arg) struct nlattr *freqs[NL80211_FREQUENCY_ATTR_MAX + 1]; struct nlattr *band, *freq; - static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = { + static const struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = { [NL80211_FREQUENCY_ATTR_FREQ] = { .type = NLA_U32 }, [NL80211_FREQUENCY_ATTR_DISABLED] = { .type = NLA_FLAG }, [NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] = { .type = NLA_FLAG }, @@ -2596,7 +2596,7 @@ static int nl80211_get_scanlist_cb(struct nl_msg *msg, void *arg) struct nlattr **tb = nl80211_parse(msg); struct nlattr *bss[NL80211_BSS_MAX + 1]; - static struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = { + static const struct nla_policy bss_policy[NL80211_BSS_MAX + 1] = { [NL80211_BSS_TSF] = { .type = NLA_U64 }, [NL80211_BSS_FREQUENCY] = { .type = NLA_U32 }, [NL80211_BSS_BSSID] = { 0 }, @@ -3421,12 +3421,12 @@ static int nl80211_get_ifcomb_cb(struct nl_msg *msg, void *arg) nla_for_each_nested(comb, attr[NL80211_ATTR_INTERFACE_COMBINATIONS], comb_rem) { - static struct nla_policy iface_combination_policy[NUM_NL80211_IFACE_COMB] = { + static const struct nla_policy iface_combination_policy[NUM_NL80211_IFACE_COMB] = { [NL80211_IFACE_COMB_LIMITS] = { .type = NLA_NESTED }, [NL80211_IFACE_COMB_MAXNUM] = { .type = NLA_U32 }, }; struct nlattr *tb_comb[NUM_NL80211_IFACE_COMB+1]; - static struct nla_policy iface_limit_policy[NUM_NL80211_IFACE_LIMIT] = { + static const struct nla_policy iface_limit_policy[NUM_NL80211_IFACE_LIMIT] = { [NL80211_IFACE_LIMIT_TYPES] = { .type = NLA_NESTED }, [NL80211_IFACE_LIMIT_MAX] = { .type = NLA_U32 }, };