Skip to content

Commit 450a580

Browse files
nhukckuba-moo
authored andcommitted
net: lan966x: Fix return type of lan966x_port_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 lan966x_port_xmit should be changed from int to netdev_tx_t. Reported-by: Dan Carpenter <[email protected]> Link: ClangBuiltLinux#1703 Cc: [email protected] Signed-off-by: Nathan Huckleberry <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent a08d97a commit 450a580

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/net/ethernet/microchip/lan966x/lan966x_main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,8 @@ static void lan966x_ifh_set_timestamp(void *ifh, u64 timestamp)
344344
IFH_POS_TIMESTAMP, IFH_LEN * 4, PACK, 0);
345345
}
346346

347-
static int lan966x_port_xmit(struct sk_buff *skb, struct net_device *dev)
347+
static netdev_tx_t lan966x_port_xmit(struct sk_buff *skb,
348+
struct net_device *dev)
348349
{
349350
struct lan966x_port *port = netdev_priv(dev);
350351
struct lan966x *lan966x = port->lan966x;

0 commit comments

Comments
 (0)