From patchwork Mon Oct 31 11:43:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 13227 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2261949wru; Mon, 31 Oct 2022 04:45:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4PUWbacBqaWFZHK2iO91a2f+ZqNwZXlbVvR6BQaHpm5PCWajKfGH8QvuDTJOs/VvUhi1Oc X-Received: by 2002:a05:6402:298e:b0:451:129e:1b35 with SMTP id eq14-20020a056402298e00b00451129e1b35mr13007680edb.79.1667216747431; Mon, 31 Oct 2022 04:45:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667216747; cv=none; d=google.com; s=arc-20160816; b=b1UClMGfhslt+qnJ5QjvgbhpN9UzpJ5UvdMMtdrJFo2KBz7GjmV3ysm5bLj7wAKpxc l2i9mDmJPVOx5pHO7EZsom1dsLN4HfE4y6oleT02DUuEvCPX0dLrMX5eBaWJoZp+RG5W BvKiQMD1bMWN/9NZt24Dq0dZwl1VdU4KKkCkc12t3zrgWl2/Z19dkvu0t4vpHhnZaWfF jklEoKMzR2MDFc3xuSIllnjpC8gIYPPGdU44cFvLO/sScIBYBpBWrjB7TNQp7VQbqrrc JJPoAcE5dWDMdrOu8j92UDHGlQgGnvuAcrl804OpBwcfQBqRRgBk4CsfkMXAiOH1YTvF 6aqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=FyR55Y7VqviQBY3RJFuseMd0/2jCIdqvXkpKiuzP5H4=; b=sXcS9aIQjNVSUoPBDD+iHnvRnN96JpPCpoPSK7WKO/4dLSx6YjfemJVPC+Omo4zcqo NmiBJAugMoi8X+Bcm4Z59n7Aui7bP8T1IuxQWEbLqTYtpPOhkUxMjsZ9QxffaJwsGI3r e0SoRx4vNK0cc0pHSuJ88M6guQMI+Rm4SrhkyXY/t4aOssvgjyk6SBttFCNVVMrvJn7s 5Q9mH0ROMyO+loP+5zkY5JK0a9/+PuusuM4cIMQuzo+uMmcbJu42jWaM3kWhAg/ayvWu KqPzf0MX4weAZ9xRYbf1S6qQ61qNEBp0kJdFuH0lWgvt1dJzHQJ0lAWIM0il5vtfYjHw t6fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TapGG1cj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o7-20020a056402038700b004587e08bc14si5951095edv.508.2022.10.31.04.45.23; Mon, 31 Oct 2022 04:45:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=TapGG1cj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230497AbiJaLoQ (ORCPT + 99 others); Mon, 31 Oct 2022 07:44:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230491AbiJaLny (ORCPT ); Mon, 31 Oct 2022 07:43:54 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D961EE0F1; Mon, 31 Oct 2022 04:43:47 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9251DB815DB; Mon, 31 Oct 2022 11:43:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6DD8C433C1; Mon, 31 Oct 2022 11:43:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667216625; bh=7CgMWQKsHtTPXkZqm7iC2oNhmPIigVqj/vJZBx2o4xg=; h=From:To:Cc:Subject:Date:From; b=TapGG1cj/MNNBx3Qa2teCF20AMx1UBkTPTwClP7Q/KpQFgnt4NM+sbJ3FL2VaGB26 t5nMsH/23wFoUzUAFu92sc83IHmkcmwrHEq1wpAzudldQD6tL+A+gYWAoQHRRAEAuu 4MGxdDKnRp1SkCh9bflpkd2ix0K5qWVr/04Aj1nsoxWGdfRErg1QeDfxYlXnE4IC6l WhR+n7CahsIZARz57uccJaeGqN6Y7c6vEq+2A204LUFS5MAzK2O7avnVbTtnos8Onk 9w61rP4t6wavtcmvmPIPfU0r957YQ0QPMeXyRbNFE7v9GUZ0ZaXwGBqFcJyxDFj3rp iSo1C0Tof/1jg== From: "Jiri Slaby (SUSE)" To: kvalo@kernel.org Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Martin Liska , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] ath11k (gcc13): synchronize ath11k_mac_he_gi_to_nl80211_he_gi()'s return type Date: Mon, 31 Oct 2022 12:43:41 +0100 Message-Id: <20221031114341.10377-1-jirislaby@kernel.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748203468124924302?= X-GMAIL-MSGID: =?utf-8?q?1748203468124924302?= ath11k_mac_he_gi_to_nl80211_he_gi() generates a valid warning with gcc-13: drivers/net/wireless/ath/ath11k/mac.c:321:20: error: conflicting types for 'ath11k_mac_he_gi_to_nl80211_he_gi' due to enum/integer mismatch; have 'enum nl80211_he_gi(u8)' drivers/net/wireless/ath/ath11k/mac.h:166:5: note: previous declaration of 'ath11k_mac_he_gi_to_nl80211_he_gi' with type 'u32(u8)' I.e. the type of the return value ath11k_mac_he_gi_to_nl80211_he_gi() in the declaration is u32, while the definition spells enum nl80211_he_gi. Synchronize them to the latter. Cc: Martin Liska Cc: Kalle Valo Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: ath11k@lists.infradead.org Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Jiri Slaby (SUSE) Reviewed-by: Jeff Johnson --- drivers/net/wireless/ath/ath11k/mac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/mac.h b/drivers/net/wireless/ath/ath11k/mac.h index 2a0d3afb0c99..0231783ad754 100644 --- a/drivers/net/wireless/ath/ath11k/mac.h +++ b/drivers/net/wireless/ath/ath11k/mac.h @@ -163,7 +163,7 @@ void ath11k_mac_drain_tx(struct ath11k *ar); void ath11k_mac_peer_cleanup_all(struct ath11k *ar); int ath11k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx); u8 ath11k_mac_bw_to_mac80211_bw(u8 bw); -u32 ath11k_mac_he_gi_to_nl80211_he_gi(u8 sgi); +enum nl80211_he_gi ath11k_mac_he_gi_to_nl80211_he_gi(u8 sgi); enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy); enum nl80211_he_ru_alloc ath11k_mac_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones); enum ath11k_supported_bw ath11k_mac_mac80211_bw_to_ath11k_bw(enum rate_info_bw bw);