Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp4047904rwb; Sun, 9 Oct 2022 16:47:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5N8CoCEuxLcTNEDDPRob/a0j12FOmEY2tyTGZrxyb/3ED8UVniqo9HhEnImmp3tM8N+Tp2 X-Received: by 2002:a17:907:270b:b0:78d:a62c:f87b with SMTP id w11-20020a170907270b00b0078da62cf87bmr3956196ejk.698.1665359268002; Sun, 09 Oct 2022 16:47:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665359267; cv=none; d=google.com; s=arc-20160816; b=CsllhBkW3JLa5Nue2g+5j6uB2wOfnRrfHNBe7b3+ibNbg7zQXF+cxUeUQeOBOd9SMU 3inof9ZAgciFWxqH72j0wdD/KWdORYK0daVh5cMfUIj6M84/cvLIneKQdo/XBJlZQCZI sg4CyNKC4d3XlljVC2wvfYsrf2K8ezPHULO8+rUOXvryNJzLTtzWqzVcVKoDB7DSZfPa Iqt/xUVMjRACItpQtswrdRhvAHRzYCE8zYr4/zx45bJPQqmpsLgXHmu4a7tTKZlaYyF8 DAw0MqJQFV2yunEhAhMW8XThm4/fv/dir02ctaVOvtL3t0kRSnvwCKMC1yoALfW9Vs2Z Rxbw== 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=HJXWkugZEEJ+N6o1yNxNq/SFpmY9VM4T9om2cWvpaup2pOdq2mZpKghZizwOD3+RBM 3aZ5O7yQ2oDhMbD8alPA8CThHDNRVLCWlF0DUXr+skP4QX7DXZ2rvtlNY7qhvCicw4lB g/YUFmRHqgo3hlX1StMEJ6Lfs741vlHSGKuRzA1mkkulRTSh2GCO2XXTArf5XGcrkuY/ pAvqJSSeGO4HS2enHYz/DTX4TzEsfYJsfHNgo+gtRzGQ/c5Q4J0LaZ2FYrraQtCSP5AH 8kIkj3vbdixfKsMXxpDIqtO7s7Oppdt6pV369zftfdBM2hqwih/hoheATqtwWfYzFLTo 09YQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mm+ppFIb; 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 q18-20020a056402519200b0045c2e7e5518si413868edd.580.2022.10.09.16.47.22; Sun, 09 Oct 2022 16:47: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=mm+ppFIb; 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 S230513AbiJIWNV (ORCPT + 99 others); Sun, 9 Oct 2022 18:13:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230404AbiJIWMh (ORCPT ); Sun, 9 Oct 2022 18:12:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34DD815A26; Sun, 9 Oct 2022 15:09:48 -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 F0BFD60CF4; Sun, 9 Oct 2022 22:09:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0944DC4314D; Sun, 9 Oct 2022 22:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665353378; bh=KiZDrteb0ZE7UEogtdroAkU8Iyt31mvEvH6D7iXd7j4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mm+ppFIbfYlfgAiKvE7a8n/5h8vWe33kPZNoNtZ8ACnmIjoYH0FCPuqnCKRkoF+UP vijtlXzi8jb4NeoqAolfPo138j6qLoN3TMWbdhZ8zz4v86Ap9COOYfIJwlaO87yeSo s1D9MzTPgVDRUct5C2U5NE542+L/xyvOgkSIoGZ8o5j9hlsEbGz+3A6W632s6f1vJk NxLO19TrtKR1E37PP9FEySxdhDo7PRlkWtwW3GqHGGMVgev38dB5maQbJA6Ok0t+uj DXghXPB643jWO4VS4bFQAk8UFUp8ewWAXwpsEZFeh/Wf6ndvrsJwyprCBMvHqFjEcT wzfVcy/GXx+2Q== 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 6.0 31/77] net: lantiq_etop: Fix return type for implementation of ndo_start_xmit Date: Sun, 9 Oct 2022 18:07:08 -0400 Message-Id: <20221009220754.1214186-31-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221009220754.1214186-1-sashal@kernel.org> References: <20221009220754.1214186-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