diff options
| author | Andy Hu <andy.hu@starfivetech.com> | 2023-12-07 13:54:55 +0300 |
|---|---|---|
| committer | Andy Hu <andy.hu@starfivetech.com> | 2023-12-07 13:54:55 +0300 |
| commit | 1ac9a37599ceacc58caa90a59f4c5f86f2581687 (patch) | |
| tree | 85d2c00dc49546d72060dccbd2a7cbe6a49835a9 | |
| parent | e5249867764fc4b6fe1ca526eefff36f26389779 (diff) | |
| parent | a0b54a31e1133d73298bebac2b0c15dacfc82751 (diff) | |
| download | linux-1ac9a37599ceacc58caa90a59f4c5f86f2581687.tar.xz | |
Merge tag 'JH7110_SDK_515_v5.10.1' into vf2-515-devel
| -rw-r--r-- | drivers/net/can/ipms_canfd.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/net/can/ipms_canfd.c b/drivers/net/can/ipms_canfd.c index 0a5e906d0a3c..d5b72aa50139 100644 --- a/drivers/net/can/ipms_canfd.c +++ b/drivers/net/can/ipms_canfd.c @@ -655,22 +655,9 @@ static netdev_tx_t canfd_driver_start_xmit(struct sk_buff *skb, struct net_devic break; } - if (!(ndev->flags & IFF_ECHO) || - (skb->protocol != htons(ETH_P_CAN) && - skb->protocol != htons(ETH_P_CANFD))) { - kfree_skb(skb); - return 0; - } - - skb = can_create_echo_skb(skb); - if (!skb) - return -ENOMEM; - - /* make settings for echo to reduce code in irq context */ - skb->ip_summed = CHECKSUM_UNNECESSARY; - skb->dev = ndev; - - skb_tx_timestamp(skb); + /*Due to cache blocking, we need call dev_kfree_skb() here to free the socket + buffer and return NETDEV_TX_OK */ + dev_kfree_skb(skb); return NETDEV_TX_OK; } |