summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/asix
diff options
context:
space:
mode:
authorNathan Huckleberry <nhuck@google.com>2022-09-12 21:40:30 +0200
committerJakub Kicinski <kuba@kernel.org>2022-09-20 03:23:04 +0200
commitfcb7c210a24209ea8f6f32593580b57f52382ec2 (patch)
tree30201bedf7f69d62b587c02faedd1fc9cb88b764 /drivers/net/ethernet/asix
parentMerge tag 'batadv-next-pullrequest-20220916' of git://git.open-mesh.org/linux... (diff)
downloadlinux-fcb7c210a24209ea8f6f32593580b57f52382ec2.tar.xz
linux-fcb7c210a24209ea8f6f32593580b57f52382ec2.zip
net: ax88796c: Fix return type of ax88796c_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 ax88796c_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> Acked-by: Lukasz Stelmach <l.stelmach@samsung.com> Link: https://lore.kernel.org/r/20220912194031.808425-1-nhuck@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/asix')
-rw-r--r--drivers/net/ethernet/asix/ax88796c_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/asix/ax88796c_main.c b/drivers/net/ethernet/asix/ax88796c_main.c
index 6ba5b024a7be..f1d610efd69e 100644
--- a/drivers/net/ethernet/asix/ax88796c_main.c
+++ b/drivers/net/ethernet/asix/ax88796c_main.c
@@ -381,7 +381,7 @@ static int ax88796c_hard_xmit(struct ax88796c_device *ax_local)
return 1;
}
-static int
+static netdev_tx_t
ax88796c_start_xmit(struct sk_buff *skb, struct net_device *ndev)
{
struct ax88796c_device *ax_local = to_ax88796c_device(ndev);