summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGUO Zihua <guozihua@huawei.com>2022-09-02 11:16:12 +0300
committerJakub Kicinski <kuba@kernel.org>2022-09-03 07:18:56 +0300
commit0dbaf0fa62329d9fe452d9041a707a33f6274f1f (patch)
treee6c41a7701c4e2840acb969f8d5aebef3e08734b
parent12f7bd252221d4f9e000e20530e50129241e3a67 (diff)
downloadlinux-0dbaf0fa62329d9fe452d9041a707a33f6274f1f.tar.xz
net: xscale: Fix return type for implementation of ndo_start_xmit
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>
-rw-r--r--drivers/net/ethernet/xscale/ixp4xx_eth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index dc81674f5d38..3b0c5f177447 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -841,7 +841,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;