diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2023-10-11 15:25:21 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2023-10-11 15:35:10 +0200 |
| commit | 88a789562472734e7e100ab2338d4ec5122aba3f (patch) | |
| tree | 4dfc36853cf337d4cfd96f4e210d277b1f701694 | |
| parent | 8c527962a16c34b159286885f13ddb383dc6b17a (diff) | |
| download | linux-can-next-rockchip-canfd.tar.gz | |
can: rockchip_canfd: convert to use new CAN length <-> DLC helpersrockchip-canfd
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | drivers/net/can/rockchip/rockchip_canfd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/can/rockchip/rockchip_canfd.c b/drivers/net/can/rockchip/rockchip_canfd.c index ab6766c487402d..4da5870c49234f 100644 --- a/drivers/net/can/rockchip/rockchip_canfd.c +++ b/drivers/net/can/rockchip/rockchip_canfd.c @@ -529,7 +529,7 @@ static int rockchip_canfd_start_xmit(struct sk_buff *skb, if (cf->can_id & CAN_EFF_FLAG) { /* Extended CAN ID format */ id = cf->can_id & CAN_EFF_MASK; - dlc = can_len2dlc(cf->len) & DLC_MASK; + dlc = can_fd_len2dlc(cf->len) & DLC_MASK; dlc |= FORMAT_MASK; /* Extended frames remote TX request */ @@ -538,7 +538,7 @@ static int rockchip_canfd_start_xmit(struct sk_buff *skb, } else { /* Standard CAN ID format */ id = cf->can_id & CAN_SFF_MASK; - dlc = can_len2dlc(cf->len) & DLC_MASK; + dlc = can_fd_len2dlc(cf->len) & DLC_MASK; /* Standard frames remote TX request */ if (cf->can_id & CAN_RTR_FLAG) @@ -638,9 +638,9 @@ static int rockchip_canfd_rx(struct net_device *ndev) /* Change CAN data length format to socketCAN data format */ if (dlc & FDF_MASK) - cf->len = can_dlc2len(dlc & DLC_MASK); + cf->len = can_fd_dlc2len(dlc & DLC_MASK); else - cf->len = get_can_dlc(dlc & DLC_MASK); + cf->len = can_cc_dlc2len(dlc & DLC_MASK); /* Change CAN ID format to socketCAN ID format */ if (dlc & FORMAT_MASK) { |