From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCC87C433EF for ; Tue, 19 Jul 2022 11:28:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236801AbiGSL2B (ORCPT ); Tue, 19 Jul 2022 07:28:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236885AbiGSL2B (ORCPT ); Tue, 19 Jul 2022 07:28:01 -0400 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EF8940BE1 for ; Tue, 19 Jul 2022 04:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1658230074; s=strato-dkim-0002; d=hartkopp.net; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=LAT/HAbljz4cDvISFLQZZfFzkNMrdlMgJCtJ632HkBY=; b=qUEkgQhO3Qd0LDtKkGpB/jUDaJKgPqP4y/XIqaqBs7frTekbNJLtjZQm3B0lLZGodQ JNfJCKWoPPyjMr36sUFDVFjevIShySxy6ARZ/CzJfbS9G0ChUxVRZWaxt0nxsy679MV+ XJncuIp9fbwthzSQlDB342zJaAC2kqsHeXm3VeuyZw2PhYQbQIa5wLGfpI4hsetptKWC XOlRzFeYXsf/6n8qO2N6yPL484Pk3qfap55VPmNagNUt6Ep4VyK2kNLMrsfJ7aleq148 OJAWBy04a8s0l0HLkX9Zvv6vzasKt2G7zB1Wr+Xz8uT2i9N0RLbaV1i7hB9HJyAa0kYS E7Bg== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjGrp7owjzFK3JbFk1mS/xvEBL7X5sbo3UIh9JiLceSWJaYwXUKbZ" X-RZG-CLASS-ID: mo00 Received: from silver.lan by smtp.strato.de (RZmta 47.47.0 AUTH) with ESMTPSA id t870d5y6JBRsGeQ (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Tue, 19 Jul 2022 13:27:54 +0200 (CEST) From: Oliver Hartkopp To: linux-can@vger.kernel.org Cc: Oliver Hartkopp Subject: [RFC PATCH v5 4/5] can: vcan: add CAN XL support Date: Tue, 19 Jul 2022 13:27:47 +0200 Message-Id: <20220719112748.3281-5-socketcan@hartkopp.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220719112748.3281-1-socketcan@hartkopp.net> References: <20220719112748.3281-1-socketcan@hartkopp.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-can@vger.kernel.org Signed-off-by: Oliver Hartkopp --- drivers/net/can/vcan.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c index a15619d883ec..d72c0727b440 100644 --- a/drivers/net/can/vcan.c +++ b/drivers/net/can/vcan.c @@ -68,33 +68,32 @@ static bool echo; /* echo testing. Default: 0 (Off) */ module_param(echo, bool, 0444); MODULE_PARM_DESC(echo, "Echo sent frames (for testing). Default: 0 (Off)"); static void vcan_rx(struct sk_buff *skb, struct net_device *dev) { - struct canfd_frame *cfd = (struct canfd_frame *)skb->data; struct net_device_stats *stats = &dev->stats; stats->rx_packets++; - stats->rx_bytes += cfd->len; + stats->rx_bytes += can_skb_get_data_len(skb); skb->pkt_type = PACKET_BROADCAST; skb->dev = dev; skb->ip_summed = CHECKSUM_UNNECESSARY; netif_rx(skb); } static netdev_tx_t vcan_tx(struct sk_buff *skb, struct net_device *dev) { - struct canfd_frame *cfd = (struct canfd_frame *)skb->data; struct net_device_stats *stats = &dev->stats; - int loop, len; + unsigned int len; + int loop; if (can_dropped_invalid_skb(dev, skb)) return NETDEV_TX_OK; - len = cfd->can_id & CAN_RTR_FLAG ? 0 : cfd->len; + len = can_skb_get_data_len(skb); stats->tx_packets++; stats->tx_bytes += len; /* set flag whether this packet has to be looped back */ loop = skb->pkt_type == PACKET_LOOPBACK; @@ -132,11 +131,11 @@ static int vcan_change_mtu(struct net_device *dev, int new_mtu) { /* Do not allow changing the MTU while running */ if (dev->flags & IFF_UP) return -EBUSY; - if (new_mtu != CAN_MTU && new_mtu != CANFD_MTU) + if (new_mtu != CAN_MTU && new_mtu != CANFD_MTU && new_mtu != CANXL_MTU) return -EINVAL; dev->mtu = new_mtu; return 0; } -- 2.30.2