From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: GUO Zihua <guozihua@huawei.com>, Jakub Kicinski <kuba@kernel.org>,
Sasha Levin <sashal@kernel.org>,
khalasa@piap.pl, davem@davemloft.net, edumazet@google.com,
pabeni@redhat.com, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.4 09/29] net: xscale: Fix return type for implementation of ndo_start_xmit
Date: Sun, 9 Oct 2022 18:22:44 -0400 [thread overview]
Message-ID: <20221009222304.1218873-9-sashal@kernel.org> (raw)
In-Reply-To: <20221009222304.1218873-1-sashal@kernel.org>
From: GUO Zihua <guozihua@huawei.com>
[ Upstream commit 0dbaf0fa62329d9fe452d9041a707a33f6274f1f ]
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.
eth_xmit() 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 <guozihua@huawei.com>
Link: https://lore.kernel.org/r/20220902081612.60405-1-guozihua@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index d4e095d0e8f1..26b5811e7263 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -821,7 +821,7 @@ static void eth_txdone_irq(void *unused)
}
}
-static int eth_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t eth_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct port *port = netdev_priv(dev);
unsigned int txreadyq = port->plat->txreadyq;
--
2.35.1
next prev parent reply other threads:[~2022-10-09 22:50 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-09 22:22 [PATCH AUTOSEL 5.4 01/29] wifi: rtw88: phy: fix warning of possible buffer overflow Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 02/29] wifi: brcmfmac: fix invalid address access when enabling SCAN log level Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 03/29] bpftool: Clear errno after libcap's checks Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 04/29] openvswitch: Fix double reporting of drops in dropwatch Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 05/29] openvswitch: Fix overreporting " Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 06/29] tcp: annotate data-race around tcp_md5sig_pool_populated Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 07/29] wifi: ath9k: avoid uninit memory read in ath9k_htc_rx_msg() Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 08/29] xfrm: Update ipcomp_scratches with NULL when freed Sasha Levin
2022-10-09 22:22 ` Sasha Levin [this message]
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 10/29] net: lantiq_etop: Fix return type for implementation of ndo_start_xmit Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 11/29] net: ftmac100: fix endianness-related issues from 'sparse' Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 12/29] wifi: brcmfmac: fix use-after-free bug in brcmf_netdev_start_xmit() Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 13/29] Bluetooth: L2CAP: initialize delayed works at l2cap_chan_create() Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 14/29] net: davicom: Fix return type of dm9000_start_xmit Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 15/29] net: ethernet: ti: davinci_emac: Fix return type of emac_dev_xmit Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 16/29] net: korina: Fix return type of korina_send_packet Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 17/29] net/sched: taprio: taprio_dump and taprio_change are protected by rtnl_mutex Sasha Levin
2022-10-10 13:33 ` Vladimir Oltean
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 18/29] Bluetooth: hci_sysfs: Fix attempting to call device_add multiple times Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 19/29] wifi: ath10k: reset pointer after memory free to avoid potential use-after-free Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 20/29] can: bcm: check the result of can_send() in bcm_can_tx() Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 21/29] wifi: rt2x00: don't run Rt5592 IQ calibration on MT7620 Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 22/29] wifi: rt2x00: set correct TX_SW_CFG1 MAC register for MT7620 Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 23/29] wifi: rt2x00: set VGC gain for both chains of MT7620 Sasha Levin
2022-10-09 22:22 ` [PATCH AUTOSEL 5.4 24/29] wifi: rt2x00: set SoC wmac clock register Sasha Levin
2022-10-09 22:23 ` [PATCH AUTOSEL 5.4 25/29] wifi: rt2x00: correctly set BBP register 86 for MT7620 Sasha Levin
2022-10-09 22:23 ` [PATCH AUTOSEL 5.4 26/29] net: If sock is dead don't access sock's sk_wq in sk_stream_wait_memory Sasha Levin
2022-10-09 22:23 ` [PATCH AUTOSEL 5.4 27/29] Bluetooth: L2CAP: Fix user-after-free Sasha Levin
2022-10-09 22:23 ` [PATCH AUTOSEL 5.4 28/29] libbpf: Fix overrun in netlink attribute iteration Sasha Levin
2022-10-09 22:23 ` [PATCH AUTOSEL 5.4 29/29] r8152: Rate limit overflow messages Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221009222304.1218873-9-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=guozihua@huawei.com \
--cc=khalasa@piap.pl \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox