Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp4049924rwb; Sun, 9 Oct 2022 16:50:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6atlgcHl0KVa5MhMojSvg2jiM9lIelFBV4nrdUoZ50m/fMIc+3xAGSf5Qw0A/mTgOhrgai X-Received: by 2002:a05:6a00:10cf:b0:563:34ce:412f with SMTP id d15-20020a056a0010cf00b0056334ce412fmr5235159pfu.67.1665359455618; Sun, 09 Oct 2022 16:50:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665359455; cv=none; d=google.com; s=arc-20160816; b=E4WZUOrCkl6toOpM8Nyv0WMYy9yKPFB/YGd508ENsJES4wEWw1V2wgngSUbI+NLTc4 sAVdayl3UvD07xfbM0C95T75MMwm8ZYHEZp5hCJ39KUYmNoaO53QejdAn6DzqzqEHGCf OxXhGFBfQ25zZpOMF4wd6umfwPfknTfBo9q7md55OfrDvKcfDDaNDfyQcq0xGQ4MQyp3 YsSpOflrnAFhVJkNQGfKEb4qfdx90CTs9QPzsO7nXIZOoR+QvUfj8A0go6BjwjojcMy2 S2a7/v4R/MakKnS5YsYFbIta1BHgMbpxfu/tcBSsIwA9VL2+k4kNugwFa1qMWCWcGYI0 92WQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=g6GWH81vZvfc+YI6uYZTuA0tIfA4noZ4YANHwrEMqUs=; b=ULQwBQgbP+m25VqcjAfVYUkkTRdrk75ITc03FBEbD2z8R3Sl5sCkhqusIWJUb2izKG n8rd4RSSL/KNNiCrAQCws3JMV+81GH6FThbuYHffXi8P2CKyRgNaRlyuoOf3/B+/QHTY VVe4g6gXcOF3fckAfS+T6CvPJ1w0CTpvBXqEaTKjDGZZ72s6NL3r2z852w8cZqFl4ISS 7zU6Iiz1e8cm59nFiFMhc9u+ttFZWTpO6GzJBwLOIkPdhE+cettT8w9y1zBUdWyzeKT1 4nf0rNclZm9UGYUjseunM2cqz/EmtMcqqoi9C6fmgjtDfrzFOd6jWhGVcbVB+bqY2sQe aBZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Z45KYWJ8; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 38-20020a631966000000b0045cfaf0bad5si9947506pgz.476.2022.10.09.16.50.44; Sun, 09 Oct 2022 16:50:55 -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=Z45KYWJ8; 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 S231800AbiJIWWg (ORCPT + 99 others); Sun, 9 Oct 2022 18:22:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231279AbiJIWVR (ORCPT ); Sun, 9 Oct 2022 18:21:17 -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 C98E43AE4E; Sun, 9 Oct 2022 15:17:13 -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 CD1A160CA0; Sun, 9 Oct 2022 22:16:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F128C433D6; Sun, 9 Oct 2022 22:16:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665353798; bh=KiZDrteb0ZE7UEogtdroAkU8Iyt31mvEvH6D7iXd7j4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z45KYWJ8x8iYzrPuAnvEDqyuM4ODIWCCDn5HcqXjVFtz+RD5gpBYV4orn7fxk2UTH H3A37nWQcXEkCGbRGsA03Sh/Jpilsn+/qUadIVo/9B37PYFuZxcIqg34rPG5ug1p9q FfEyUNtqVKRoxfh/7d3PmkdVrW+2ZUvYJMZ+/hzSlEEM6fKl9G8O4piMlQ8+4sgi0c LMiAGgD8Mr4LliwZ2fVN+2dFf55++rEcKpp0Pgghq5UJDT/2VszCaC98BaMNsvyD3e OlrvXXpaxPDGDn+UQboH1KWXQfxLeV0u7/JIMtsZjJ6JAjx015bTmPQhi6T/FscF7u aZHPobGk0pfKA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: GUO Zihua , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, olek2@wp.pl, yangyingliang@huawei.com, rdunlap@infradead.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.19 28/73] net: lantiq_etop: Fix return type for implementation of ndo_start_xmit Date: Sun, 9 Oct 2022 18:14:06 -0400 Message-Id: <20221009221453.1216158-28-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009221453.1216158-1-sashal@kernel.org> References: <20221009221453.1216158-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.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 From: GUO Zihua [ Upstream commit c8ef3c94bda0e21123202d057d4a299698fa0ed9 ] Since Linux now supports CFI, it will be a good idea to fix mismatched return type for implementation of hooks. Otherwise this might get cought out by CFI and cause a panic. ltq_etop_tx() would return either NETDEV_TX_BUSY or NETDEV_TX_OK, so change the return type to netdev_tx_t directly. Signed-off-by: GUO Zihua Link: https://lore.kernel.org/r/20220902081521.59867-1-guozihua@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/lantiq_etop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 7cedbe1fdfd7..59aab4086dcc 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -470,7 +470,7 @@ ltq_etop_stop(struct net_device *dev) return 0; } -static int +static netdev_tx_t ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) { int queue = skb_get_queue_mapping(skb); -- 2.35.1