summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/litex
diff options
context:
space:
mode:
authorNathan Huckleberry <nhuck@google.com>2022-09-12 12:53:07 -0700
committerJakub Kicinski <kuba@kernel.org>2022-09-19 18:23:39 -0700
commit40662333dd7c64664247a6138bc33f3974e3a331 (patch)
treea0622ed041dd53da3d0b826340f28a88f5295387 /drivers/net/ethernet/litex
parent5972ca946098487c5155fe13654743f9010f5ed5 (diff)
net: ethernet: litex: Fix return type of liteeth_start_xmit
The ndo_start_xmit field in net_device_ops is expected to be of type netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition. The return type of liteeth_start_xmit should be changed from int to netdev_tx_t. Reported-by: Dan Carpenter <error27@gmail.com> Link: https://github.com/ClangBuiltLinux/linux/issues/1703 Cc: llvm@lists.linux.dev Signed-off-by: Nathan Huckleberry <nhuck@google.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Acked-by: Gabriel Somlo <gsomlo@gmail.com> Link: https://lore.kernel.org/r/20220912195307.812229-1-nhuck@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/litex')
-rw-r--r--drivers/net/ethernet/litex/litex_liteeth.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/litex/litex_liteeth.c b/drivers/net/ethernet/litex/litex_liteeth.c
index fdd99f0de424..35f24e0f0934 100644
--- a/drivers/net/ethernet/litex/litex_liteeth.c
+++ b/drivers/net/ethernet/litex/litex_liteeth.c
@@ -152,7 +152,8 @@ static int liteeth_stop(struct net_device *netdev)
return 0;
}
-static int liteeth_start_xmit(struct sk_buff *skb, struct net_device *netdev)
+static netdev_tx_t liteeth_start_xmit(struct sk_buff *skb,
+ struct net_device *netdev)
{
struct liteeth *priv = netdev_priv(netdev);
void __iomem *txbuffer;