You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2026/10/08 19:11:57 UTC
(nuttx) branch master updated (70d7f893839 -> 14b62c50f37)
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 70d7f893839 drivers/can/ctucanfd_pci.c: fix SocketCAN RX build and packet leak.
new 0cc1ce6b799 kvaser_pci.c: fix compilation error
new a87bb18531d drivers/can/kvaser_pci.c: fix nxstyle issues
new 14b62c50f37 drivers/can: fix netdev_lower_carrier_XXX crash for kvaser card
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
drivers/can/kvaser_pci.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
(nuttx) 03/03: drivers/can: fix netdev_lower_carrier_XXX crash for kvaser card
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 14b62c50f37dc954383f97d265f968bfede5eef5
Author: p-szafonimateusz <p-...@xiaomi.com>
AuthorDate: Tue Mar 17 11:47:15 2026 +0100
drivers/can: fix netdev_lower_carrier_XXX crash for kvaser card
netdev_lower_carrier_XXX can't be called before netdev is registered
Signed-off-by: p-szafonimateusz <p-...@xiaomi.com>
Signed-off-by: dongjiuzhu1 <do...@xiaomi.com>
---
drivers/can/kvaser_pci.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/can/kvaser_pci.c b/drivers/can/kvaser_pci.c
index 1cd70eaa1e5..7e2760f54f8 100644
--- a/drivers/can/kvaser_pci.c
+++ b/drivers/can/kvaser_pci.c
@@ -1665,12 +1665,6 @@ static int kvaser_probe(FAR struct pci_device_s *dev)
netdev->quota[NETPKT_RX] = KVASER_RX_QUOTA;
netdev->ops = &g_kvaser_net_ops;
- /* Put the interface in the down state. This usually amounts to
- * resetting the device and/or calling kvaser_sock_ifdown().
- */
-
- kvaser_sock_ifdown(&priv->sja[i].dev);
-
/* Register the network interface. */
ret = netdev_lower_register(netdev, NET_LL_CAN);
@@ -1679,6 +1673,12 @@ static int kvaser_probe(FAR struct pci_device_s *dev)
pcierr("ERROR: failed to register count=%d, %d\n", i, ret);
goto errout;
}
+
+ /* Put the interface in the down state. This usually amounts to
+ * resetting the device and/or calling kvaser_sock_ifdown().
+ */
+
+ kvaser_sock_ifdown(&priv->sja[i].dev);
#endif
}
(nuttx) 01/03: kvaser_pci.c: fix compilation error
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0cc1ce6b7999f6d2c803ac193c3d0f5824f45b81
Author: p-szafonimateusz <p-...@xiaomi.com>
AuthorDate: Thu Mar 12 13:18:16 2026 +0100
kvaser_pci.c: fix compilation error
fix compilation error for netpkt_free
Signed-off-by: p-szafonimateusz <p-...@xiaomi.com>
---
drivers/can/kvaser_pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/can/kvaser_pci.c b/drivers/can/kvaser_pci.c
index dbea606129b..429e6d53263 100644
--- a/drivers/can/kvaser_pci.c
+++ b/drivers/can/kvaser_pci.c
@@ -1262,7 +1262,7 @@ static FAR netpkt_t *kvaser_sock_recv(FAR struct netdev_lowerhalf_s *dev)
kvaser_putreg_sja(priv, SJA1000_CMD_REG, SJA1000_RELEASE_BUF);
- netpkt_free(dev, pkt);
+ netpkt_free(dev, pkt, NETPKT_RX);
return NULL;
#endif
}
(nuttx) 02/03: drivers/can/kvaser_pci.c: fix nxstyle issues
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit a87bb18531d99469cd17ea09640e3087d87c793c
Author: p-szafonimateusz <p-...@xiaomi.com>
AuthorDate: Wed Oct 7 08:42:24 2026 +0200
drivers/can/kvaser_pci.c: fix nxstyle issues
add missing blank lines after declarations
Signed-off-by: p-szafonimateusz <p-...@xiaomi.com>
---
drivers/can/kvaser_pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/can/kvaser_pci.c b/drivers/can/kvaser_pci.c
index 429e6d53263..1cd70eaa1e5 100644
--- a/drivers/can/kvaser_pci.c
+++ b/drivers/can/kvaser_pci.c
@@ -302,6 +302,7 @@ static void kvaser_putreg_sja(FAR struct kvaser_sja_s *priv,
uint8_t value)
{
uintptr_t addr = priv->base + offset;
+
pci_write_io_byte(priv->pcidev, addr, value);
}
@@ -328,6 +329,7 @@ static void kvaser_putreg_s5920(FAR struct kvaser_driver_s *priv,
uint32_t value)
{
uintptr_t addr = priv->s5920_base + offset;
+
pci_write_io_dword(priv->pcidev, addr, value);
}