From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07E02C4332F for ; Sun, 9 Oct 2022 22:35:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232734AbiJIWfw (ORCPT ); Sun, 9 Oct 2022 18:35:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232680AbiJIWc6 (ORCPT ); Sun, 9 Oct 2022 18:32:58 -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 1DBAC3A4BB; Sun, 9 Oct 2022 15:20:10 -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 56AECB80D36; Sun, 9 Oct 2022 22:20:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC92AC433D6; Sun, 9 Oct 2022 22:19:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665353999; bh=FhhSJC2YPflSTn633sxHzhMf4u75DE17zOHJZNcYx0M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJQI/JQvHTXK7crDHebTqok1KBQ97AjJ2iRFD+C9Gg+9t93VM3MFHtn7DO/oc1UQV gcPTUgpXqwba+CZLkXDxbqZB1VtXqQQbSpcrNeola8Mi1hqD1DMUQcYCzhNOvBXkK+ SWDltfEBcT+XjSam+2JSy57CIZV0vPQyGPXHO/se0gfQlO7M0R4m5oi50ZHzN+nLTW GoMftE7CviGMB/4UbKei+rlf3rwfpBAmzv4cSoCERqLla/7xBbuhwruE3LbPuh77ii s+d5b9e2e3PLmjjFI9hani1WQkvrC5aZ6qjFPCkGXg5Qzx/n5iWUiU+NcM/GC8zf4p u/gNcfaipKEJg== 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, rdunlap@infradead.org, yangyingliang@huawei.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 17/46] net: lantiq_etop: Fix return type for implementation of ndo_start_xmit Date: Sun, 9 Oct 2022 18:18:42 -0400 Message-Id: <20221009221912.1217372-17-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009221912.1217372-1-sashal@kernel.org> References: <20221009221912.1217372-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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 62f8c5212182..7664116b3a62 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -451,7 +451,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