On 11/6/20 6:02 PM, Gerhard Uttenthaler wrote:
> Signed-off-by: Gerhard Uttenthaler <uttenthaler@xxxxxxxxxxxxxxxx>
> ---
> drivers/net/can/usb/ems_usb.c | 87 +++++++++++++++++++----------------
> 1 file changed, 47 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c
> index c464d644c833..c3159ffaa4fa 100644
> --- a/drivers/net/can/usb/ems_usb.c
> +++ b/drivers/net/can/usb/ems_usb.c
> @@ -899,64 +899,71 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
> struct ems_usb *dev = netdev_priv(netdev);
> struct ems_tx_urb_context *context = NULL;
> struct net_device_stats *stats = &netdev->stats;
> - struct can_frame *cf = (struct can_frame *)skb->data;
> struct ems_cpc_msg *msg;
> struct urb *urb;
> int i, err;
> + u8 dlc;
>
> u8 *buf;
> size_t buf_size;
> size_t buf_len = CPC_HEADER_SIZE + CPC_MSG_HEADER_LEN;
>
> - if (can_dropped_invalid_skb(netdev, skb))
why move this into the if? it's common code with fd and non fd
> + if (can_is_canfd_skb(skb)) {
> + // Placeholder for next patch
no placeholders please
> return NETDEV_TX_OK;
> + } else {
> + struct can_frame *cf = (struct can_frame *)skb->data;
>
> - buf_size = CPC_HEADER_SIZE +
> - CPC_MSG_HEADER_LEN +
> - sizeof(struct cpc_can_msg);
> + if (can_dropped_invalid_skb(netdev, skb))
> + return NETDEV_TX_OK;
>
> - /* Create an URB, and a buffer for it
> - * and copy the data to the URB
> - */
> - urb = usb_alloc_urb(0, GFP_ATOMIC);
> - if (!urb)
> - goto nomem;
> -
> - buf = usb_alloc_coherent(dev->udev,
> - buf_size,
> - GFP_ATOMIC,
> - &urb->transfer_dma);
> - if (!buf) {
> - netdev_err(netdev, "No memory left for USB buffer\n");
> - usb_free_urb(urb);
> - goto nomem;
> - }
> - // Clear first 4 bytes
> - *(u32 *)buf = 0;
> + buf_size = CPC_HEADER_SIZE +
> + CPC_MSG_HEADER_LEN +
> + sizeof(struct cpc_can_msg);
>
> - msg = (struct ems_cpc_msg *)&buf[CPC_HEADER_SIZE];
> + /* Create an URB, and a buffer for it
> + * and copy the data to the URB
> + */
> + urb = usb_alloc_urb(0, GFP_ATOMIC);
> + if (!urb)
> + goto nomem;
> +
> + buf = usb_alloc_coherent(dev->udev,
> + buf_size,
> + GFP_ATOMIC,
> + &urb->transfer_dma);
> + if (!buf) {
> + netdev_err(netdev, "No memory left for USB buffer\n");
> + usb_free_urb(urb);
> + goto nomem;
> + }
> + // Clear first 4 bytes
> + *(u32 *)buf = 0;
>
> - msg->msg.can_msg.id = cpu_to_le32(cf->can_id & CAN_ERR_MASK);
> - msg->msg.can_msg.length = cf->can_dlc;
> + msg = (struct ems_cpc_msg *)&buf[CPC_HEADER_SIZE];
>
> - if (cf->can_id & CAN_RTR_FLAG) {
> - msg->type = cf->can_id & CAN_EFF_FLAG ?
> - CPC_CMD_TYPE_EXT_RTR_FRAME : CPC_CMD_TYPE_RTR_FRAME;
> + msg->msg.can_msg.id = cpu_to_le32(cf->can_id & CAN_ERR_MASK);
> + dlc = cf->can_dlc;
> + msg->msg.can_msg.length = dlc;
>
> - msg->length = CPC_CAN_MSG_MIN_SIZE;
> - } else {
> - msg->type = cf->can_id & CAN_EFF_FLAG ?
> - CPC_CMD_TYPE_EXT_CAN_FRAME : CPC_CMD_TYPE_CAN_FRAME;
> + if (cf->can_id & CAN_RTR_FLAG) {
> + msg->type = cf->can_id & CAN_EFF_FLAG ?
> + CPC_CMD_TYPE_EXT_RTR_FRAME : CPC_CMD_TYPE_RTR_FRAME;
>
> - for (i = 0; i < cf->can_dlc; i++)
> - msg->msg.can_msg.msg[i] = cf->data[i];
> + msg->length = CPC_CAN_MSG_MIN_SIZE;
> + } else {
> + msg->type = cf->can_id & CAN_EFF_FLAG ?
> + CPC_CMD_TYPE_EXT_CAN_FRAME : CPC_CMD_TYPE_CAN_FRAME;
>
> - msg->length = CPC_CAN_MSG_MIN_SIZE + cf->can_dlc;
> - }
> + for (i = 0; i < cf->can_dlc; i++)
> + msg->msg.can_msg.msg[i] = cf->data[i];
>
> - // Send only significant bytes of buffer
> - buf_len += msg->length;
> + msg->length = CPC_CAN_MSG_MIN_SIZE + cf->can_dlc;
> + }
>
> + // Send only significant bytes of buffer
> + buf_len += msg->length;
> + }
> for (i = 0; i < MAX_TX_URBS; i++) {
> if (dev->tx_contexts[i].echo_index == MAX_TX_URBS) {
> context = &dev->tx_contexts[i];
> @@ -978,7 +985,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne
>
> context->dev = dev;
> context->echo_index = i;
> - context->dlc = cf->can_dlc;
> + context->dlc = dlc;
>
> usb_fill_bulk_urb(urb, dev->udev, usb_sndbulkpipe(dev->udev, 2), buf,
> buf_len, ems_usb_write_bulk_callback, context);
>
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung West/Dortmund | Phone: +49-231-2826-924 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Attachment:
signature.asc
Description: OpenPGP digital signature
