diff --git a/canutils/lely-canopen/0005-add-NuttX-support.patch b/canutils/lely-canopen/0005-add-NuttX-support.patch index 11b6198f5..c33b5c104 100644 --- a/canutils/lely-canopen/0005-add-NuttX-support.patch +++ b/canutils/lely-canopen/0005-add-NuttX-support.patch @@ -120,7 +120,7 @@ index ca7e7d95..fed1ae16 100644 + return -1; + } + -+ *pbitrate = ifr.ifr_ifru.ifru_can_data.arbi_bitrate * 1000; ++ *pbitrate = ifr.ifr_ifru.ifru_can_data.arbi_bitrate; + + return 0; +} @@ -141,8 +141,8 @@ index ca7e7d95..fed1ae16 100644 + struct ifreq ifr; + if_indextoname(can->ifindex, ifr.ifr_name); + -+ ifr.ifr_ifru.ifru_can_data.arbi_bitrate = bitrate / 1000; -+ ifr.ifr_ifru.ifru_can_data.data_bitrate = bitrate / 1000; ++ ifr.ifr_ifru.ifru_can_data.arbi_bitrate = bitrate; ++ ifr.ifr_ifru.ifru_can_data.data_bitrate = bitrate; + ifr.ifr_ifru.ifru_can_data.arbi_samplep = 0; + ifr.ifr_ifru.ifru_can_data.data_samplep = 0; + diff --git a/canutils/slcan/slcan.c b/canutils/slcan/slcan.c index f6b6c4e3c..84d7a1399 100644 --- a/canutils/slcan/slcan.c +++ b/canutils/slcan/slcan.c @@ -363,9 +363,7 @@ int main(int argc, char *argv[]) /* set the device name */ strlcpy(ifr.ifr_name, argv[1], IFNAMSIZ); - - ifr.ifr_ifru.ifru_can_data.arbi_bitrate = - canspeed / 1000; /* Convert bit/s to kbit/s */ + ifr.ifr_ifru.ifru_can_data.arbi_bitrate = canspeed; ifr.ifr_ifru.ifru_can_data.arbi_samplep = 80; if (ioctl(s, SIOCSCANBITRATE, &ifr) < 0)