From patchwork Mon Oct 31 11:44:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 13231 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2262280wru; Mon, 31 Oct 2022 04:46:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ieH7tE4vzJGnRgTwhfqcsS65RaV5HhiHhOKe66oJrjb4SPzxnCaMiLnKWfbI6iiQqeHnv X-Received: by 2002:a17:907:6e03:b0:78e:1c82:1f2a with SMTP id sd3-20020a1709076e0300b0078e1c821f2amr12009600ejc.611.1667216787168; Mon, 31 Oct 2022 04:46:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667216787; cv=none; d=google.com; s=arc-20160816; b=ObceokjT5HLmWEeA4knxpmTP81ScMy/BxPrulzF0xCaJGuFzmb7yvIuFFiT+rPbMTQ p2VCwzX1iSomZCjrHmSZJbg3ZK9AO+njCYkXXGRIKFx0NOopFwOyJDusuyfZpEXR/Ivy tHzZW4L137g44U8E1Gz3U7xdfU26CHB8XIMQF0mOZGZIZ4KFl3Wuy2BXwxy6NDayBlqF ATq52MunCaMkNyI2y0u52gsLybpqKvDymtX3+3jsZTenYTQbmX6cmm3iatcBtpK8d0pC ppZz2VPV/OpVu8f+AZVcAfu30+B52MldeHo3qAd0EEjuO88IdthgxnJRQcvrZPsiKC1P fxqA== 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=g7/CHGYp6qGDoIADs7kLFur3Qw5MM7YOijv319EwcS0=; b=P3dgosSKwGSeLsfBobM0ButKzlIrj5mvEEmU8iAR/KYl5sfci+tv9Tq9MKQu3Ry4yH qNkopeAF5qE797QTqR16iVmqRH1ZlZBTPYRvYEtvgtTw3dWQKrarkAI0PZ+iRtb/l23O WdPhn1eqlUpqjrlqvswsv31oxSzgTGb8+yw+UCkpNqKLKHR35iP5jn9fMMuc+rITsavY IddIonu6l21xU/X7slTMNBQCZlHtlXtfFkIsihUF1c+CQ2AgeuaQWU3qpLDUGXYxNTnm JLUQeUZUzCOTw7WpRVB8WSNvhzKE+hbCBYPhMWiM3VeHcNbROKIaiIFOvSPHYMZSflgI 91hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=fj0jIFsk; 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 y4-20020a056402440400b0045bd677b3d5si9276368eda.342.2022.10.31.04.46.02; Mon, 31 Oct 2022 04:46:27 -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=fj0jIFsk; 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 S231126AbiJaLpU (ORCPT + 99 others); Mon, 31 Oct 2022 07:45:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230513AbiJaLoq (ORCPT ); Mon, 31 Oct 2022 07:44:46 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C32ACE0E2; Mon, 31 Oct 2022 04:44:45 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 5F51960FD3; Mon, 31 Oct 2022 11:44:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EEEAC433D6; Mon, 31 Oct 2022 11:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667216684; bh=gq8XQLGdZXzEXSUh75QeQ+qd9vC3nuRLj1ibJ386OHk=; h=From:To:Cc:Subject:Date:From; b=fj0jIFskNjP+Ue94bDPQGzFTPfAIKXXNfIGkMfM+zFIH5T+Lwj58p6krGSA8voSlo jQtgqElf+XtCMpHa0tBBSwuQSIKJLivYjEz3wNdi+TPt20+kB30Ypg5R7XmMu1q560 lPcOWKggEWDaFWzQk1REFdgq7ZCVYUySa0y6oGiY1dIHsDHzCzKitH+uD87KWuMvsM nZfP8pKg7kn4/wSqmAGWVoKIHAU8HRoRMYxN01CcgKPzFFyaMWhkAgcpQJ9Fm1a+cj r1wKlBaLmmPKnvh6vRdw6nwPKp+vvfovNOoxfblbrAd2Vx5zQc+vyWlfFIorQ3eLNX vx5lUjWpuX7JQ== From: "Jiri Slaby (SUSE)" To: ecree.xilinx@gmail.com Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Martin Liska , Martin Habets , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org Subject: [PATCH] sfc (gcc13): synchronize ef100_enqueue_skb()'s return type Date: Mon, 31 Oct 2022 12:44:40 +0100 Message-Id: <20221031114440.10461-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?1748203509842824116?= X-GMAIL-MSGID: =?utf-8?q?1748203509842824116?= ef100_enqueue_skb() generates a valid warning with gcc-13: drivers/net/ethernet/sfc/ef100_tx.c:370:5: error: conflicting types for 'ef100_enqueue_skb' due to enum/integer mismatch; have 'int(struct efx_tx_queue *, struct sk_buff *)' drivers/net/ethernet/sfc/ef100_tx.h:25:13: note: previous declaration of 'ef100_enqueue_skb' with type 'netdev_tx_t(struct efx_tx_queue *, struct sk_buff *)' I.e. the type of the ef100_enqueue_skb()'s return value in the declaration is int, while the definition spells enum netdev_tx_t. Synchronize them to the latter. Cc: Martin Liska Cc: Edward Cree Cc: Martin Habets Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: netdev@vger.kernel.org Signed-off-by: Jiri Slaby (SUSE) --- drivers/net/ethernet/sfc/ef100_tx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sfc/ef100_tx.c b/drivers/net/ethernet/sfc/ef100_tx.c index 102ddc7e206a..29ffaf35559d 100644 --- a/drivers/net/ethernet/sfc/ef100_tx.c +++ b/drivers/net/ethernet/sfc/ef100_tx.c @@ -367,7 +367,8 @@ void ef100_ev_tx(struct efx_channel *channel, const efx_qword_t *p_event) * Returns 0 on success, error code otherwise. In case of an error this * function will free the SKB. */ -int ef100_enqueue_skb(struct efx_tx_queue *tx_queue, struct sk_buff *skb) +netdev_tx_t ef100_enqueue_skb(struct efx_tx_queue *tx_queue, + struct sk_buff *skb) { return __ef100_enqueue_skb(tx_queue, skb, NULL); }