sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-08-05 06:20:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
700 Commits 1 Branch 9 Tags
856d0a662a02dd2dc0b83a7ad1de9fd120e82c4b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Kleine-BuddeandGitHub 856d0a662a Merge pull request #259 from marckleinebudde/cansequence 
cansequence: do_send(): remove unneeded cast
 2020-11-04 17:08:52 +01:00
Marc Kleine-Budde ccfa3c8b00 cansequence: do_send(): remove unneeded cast 
This patch fixes the following warning:

cansequence.c:232:3: warning: expression result unused [-Wunused-value]
	(unsigned char)frame.data[0]++;
	^              ~~~~~~~~~~~~~~~

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-11-04 14:58:10 +01:00
Marc Kleine-BuddeandGitHub a6cac755b4 Merge pull request #258 from gibsson/master 
Android.mk: remove duplicated cansequence definition
 2020-11-04 14:57:44 +01:00
Marc Kleine-BuddeandOliver Hartkopp 4573e852f9 log2asc: fix spelling 
Fixes: 61dbb56ef6 ("log2asc: support DLC values in Classic CAN RTR frames")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-19 20:52:05 +02:00
Marc Kleine-BuddeandGitHub 09466c2f1d Merge pull request #255 from marckleinebudde/ppc64le 
travis: fix env for ppc64le
 2020-10-19 15:00:41 +02:00
Marc Kleine-Budde eada3b4f53 travis: fix env for ppc64le 
Fixes: b7ba7f32fc ("added script to run on power")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-19 14:37:30 +02:00
Marc Kleine-BuddeandGitHub cb5d2fd653 Merge pull request #254 from marckleinebudde/cansequence 
can-utils: import PTX cansequence utility
 2020-10-19 14:35:04 +02:00
Marc Kleine-Budde a726c2a57a Merge branch 'cansequence' of github.com:marckleinebudde/can-utils into master 
The PTX flavour canutils have a useful utility for generating a sequence of CAN
frames with an incrementing payload and checking such a sequence for missed and
reordered frames.

Recently, it has helped finding a regression in the kernel pfifo_fast qdisc,
which led to reordered frames.

To bring the utility to a greater audience, import the current state, including
its history, into the linux-can set of utilities.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-19 13:44:16 +02:00
Marc Kleine-Budde a8131b7996 cansequence: add SPDX identifier for GPL-2.0-only and copyrights 
Message-Id: 20201019111239.GM12463@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-19 13:26:43 +02:00
Marc Kleine-BuddeandGitHub 93ef09d9b0 Merge pull request #242 from marckleinebudde/travis-ppc64le 
travis: add ppc64le support
 2020-10-15 18:36:19 +02:00
Marc Kleine-BuddeandGitHub 677f9ec26f Merge pull request #253 from marckleinebudde/fix-indention 
Makefile: fix indention
 2020-10-15 18:35:12 +02:00
Marc Kleine-Budde f3cf4cdf88 Makefile: fix indention 
This patch fixes the indention, which was broken while renaming the j1939
tools.

Fixes: 8106214b55 ("Rename j* to j1939\1")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-15 18:08:49 +02:00
Marc Kleine-Budde 2afcbd2fee cansequence: print error frames in hex 
Fixes: faad20983348 ("cansequence: receive snd show error frames")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde 00134246c2 cansequence.c: add extended identifier flag to mask 
Without this, the extended identifier flag was not important when
filtering on CAN frames. Add this to mask to only receive the frame type
we want to recieve.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde a1c20aeb45 cansequence: receive snd show error frames 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde d699135833 cansequence: show delta and obsolute overflows 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde de5b9607dc cansequence: add internal 32 bit sequence counter 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde 36fc75bdb7 cansequence: use sigaction() instead of signal 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde 68d5f87889 cansequence: exit with failure in case of unknown option 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde 4d50109a69 cansequence: do_receive: move variables into loop 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde ac9124c776 cansequence: sort options more alphabetically 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde 0bcb5d9c2c cansequence: codingstyle cleanups 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde 1e0fb39e8b cansequence: add support for drop after a certain number of incidents 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:32 +02:00
Marc Kleine-Budde 9567230494 cansequence: print out dropped packages by socket counter 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:30 +02:00
Marc Kleine-Budde 985121aaad cansequence: cleanup perror() and exit() 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:24 +02:00
Marc Kleine-Budde 7975f9859c cansequence: make use of bool variables 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:24 +02:00
Marc Kleine-Budde c9bb22022d cansequence: move rx and tx loop into separate functions 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:24 +02:00
Marc Kleine-Budde 2f125e44ce cansequence: mark functions as static 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:24 +02:00
Marc Kleine-Budde 9841820ea0 [cansequence] add sequence wrap around counter 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:24 +02:00
Marc Kleine-Budde fb5903f226 [cansequece] added various improvements 
- added poll support if sender
- add cmd line option for can_id
- setup canfilter to disable receiving in sender mode

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-10-14 18:02:24 +02:00
Marc Kleine-Budde 4aaad29082 * src/cansequence.c: 
obay loop option


git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@104 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c
 2020-10-14 18:02:24 +02:00
Marc Kleine-Budde a16f8ed471 git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@98 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c 2020-10-14 18:02:24 +02:00
Marc Kleine-Budde 6e3b123d5b git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@97 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c 2020-10-14 18:02:20 +02:00
Marc Kleine-Budde c93d3a63c5 * src/cansequence.c, src/cansend.c: 
fix interface cmd line

git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@95 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c
 2020-10-14 18:02:10 +02:00
Marc Kleine-Budde 5fa35cbe2a git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@92 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c 2020-10-14 18:02:01 +02:00
Marc Kleine-Budde f4cec293dc git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@91 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c 2020-10-14 18:01:50 +02:00
Marc Kleine-Budde bd3ea25fe1 * src/cansequence.c, src/cansend.c: 
cleanups

git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@90 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c
 2020-10-14 18:01:48 +02:00
Marc Kleine-Budde d8be4d8a4f * src/canecho.c, src/candump.c, src/cansequence.c, src/cansend.c: 
include limits.h

git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@89 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c
 2020-10-14 18:01:37 +02:00
Marc Kleine-Budde b3b501d922 git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-3.0-trunk@88 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c 2020-10-14 18:01:23 +02:00
Marc Kleine-Budde 0c888d7942 * src/cansequence.c: 
fixed print of received frame number


git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-2.0-trunk@85 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c
 2020-10-14 18:00:36 +02:00
Marc Kleine-Budde ac8ae17727 * src/cansequence.c: 
fixed out of order expected and received value


git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-2.0-trunk@84 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c
 2020-10-14 18:00:36 +02:00
Marc Kleine-Budde 3794644caa git-svn-id: https://iocaste.extern.pengutronix.de/svn/canutils/trunks/canutils-2.0-trunk@71 5fd5a299-6ef2-0310-aa18-8b01d7c39d8c 2020-10-14 18:00:33 +02:00
Marc Kleine-BuddeandGitHub bda4b0ad8c Merge pull request #251 from neheb/clng 
custom if statement reordering
 2020-10-13 08:55:34 +02:00
Marc Kleine-BuddeandGitHub 7759b00c58 Merge pull request #250 from neheb/clng 
clang-tidy fixes
 2020-10-13 08:44:49 +02:00
Marc Kleine-BuddeandGitHub 5a93509655 Merge pull request #249 from neheb/nanosleep 
convert usleep to nanosleep
 2020-10-12 08:48:33 +02:00
Marc Kleine-BuddeandGitHub 18573d1dd2 Merge pull request #248 from neheb/bzr 
j1939cat: remove bzero
 2020-10-12 08:12:05 +02:00
Marc Kleine-BuddeandGitHub 485d813545 Merge pull request #244 from marckleinebudde/canfdtest-check-device 
canfdtest: bail out if trying to use non-existing CAN interface
 2020-09-29 09:14:29 +02:00
Marc Kleine-Budde ce7f22928d canfdtest: bail out if trying to use non-existing CAN interface 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-09-29 09:06:12 +02:00
Marc Kleine-BuddeandGitHub dd8fb0b697 Merge pull request #241 from marckleinebudde/travis 
travis: fix indention
 2020-09-25 15:33:55 +02:00
Marc Kleine-Budde b99f540039 travis: add architecture marker 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-09-25 15:33:00 +02:00
Marc Kleine-Budde 7fb2585641 travis: fix indention 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-09-25 15:24:25 +02:00
Marc Kleine-BuddeandGitHub e1f75da433 Merge pull request #240 from marckleinebudde/canfdtest 
canfdtest: remove trailing whitespace and print RX'ed frame in case of RX before TX
 2020-09-24 11:27:10 +02:00
Marc Kleine-Budde 435a59a394 canfdtest: can_echo_gen(): print RX'ed frame in case of RX before TX 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-09-24 11:13:41 +02:00
Marc Kleine-Budde 73e421557f canfdtest: remove trailing whitespace 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-09-24 11:13:38 +02:00
Marc Kleine-BuddeandGitHub e6dfcb773e Merge pull request #237 from marckleinebudde/fix-canfdtest 
canfdtest: fix frame consistency check
 2020-08-20 09:33:11 +02:00
Marc Kleine-Budde c43a168c68 canfdtest: fix frame consistency check 
This patch fixes the issue reported in:

https://github.com/linux-can/can-utils/commit/d7f28a0ffe36f73fe08729202f9c49ca5cac1dd4
https://github.com/linux-can/can-utils/issues/236

Reported-by: https://github.com/ronitnvidia
Fixes: d7f28a0ffe ("canfdtest: can_echo_dut(): check received frame for consistency")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-08-20 09:30:27 +02:00
Marc Kleine-BuddeandGitHub ab23c6f7e7 Merge pull request #232 from olerem/testj1939 
testj1939: print proper offset in the data damp
 2020-08-07 15:06:36 +02:00
Marc Kleine-BuddeandGitHub 58dc257e11 Merge pull request #231 from olerem/jcat-bam 
j1939cat: add broadcast support
 2020-08-07 14:23:46 +02:00
Marc Kleine-BuddeandGitHub 659e0acfe6 Merge pull request #230 from marckleinebudde/j1939acd 
j1939acd help text improvements
 2020-08-07 14:10:29 +02:00
Marc Kleine-BuddeandGitHub dec3c5eda1 Merge pull request #225 from marckleinebudde/fix-warnings 
Fix warnings
 2020-08-07 13:53:48 +02:00
Marc Kleine-BuddeandGitHub bad90515f0 Merge pull request #229 from joseogandoj/patch-1 
Update testj1939.c
 2020-07-31 08:21:17 +02:00
Marc Kleine-Budde 8e3c050b1c CMakeLists.txt: update test for _GNU_SOURCE to fix warnings 
../asc2log.c:264:8: warning: implicit declaration of function 'strcasestr' is invalid in C99 [-Wimplicit-function-declaration]
        ptr = strcasestr(buf, tmp1);
              ^
../asc2log.c:264:6: warning: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
        ptr = strcasestr(buf, tmp1);
            ^ ~~~~~~~~~~~~~~~~~~~~~
../asc2log.c:328:6: warning: implicit declaration of function 'strcasestr' is invalid in C99 [-Wimplicit-function-declaration]
        if (strcasestr(date, " pm ") != NULL) {
            ^
../asc2log.c:328:31: warning: comparison between pointer and integer ('int' and 'void *') [-Wpointer-integer-compare]
        if (strcasestr(date, " pm ") != NULL) {
            ~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~
../asc2log.c:336:8: warning: implicit declaration of function 'strptime' is invalid in C99 [-Wimplicit-function-declaration]
                if (!strptime(date, "%B %d %I:%M:%S %p %Y", &tms)) {
                     ^
../asc2log.c:354:8: warning: implicit declaration of function 'strptime' is invalid in C99 [-Wimplicit-function-declaration]
                if (!strptime(date, "%B %d %H:%M:%S %Y", &tms)) {

../slcanpty.c:476:7: warning: implicit declaration of function 'grantpt' is invalid in C99 [-Wimplicit-function-declaration]
                if (grantpt(p) < 0) {
                    ^
../slcanpty.c:481:7: warning: implicit declaration of function 'unlockpt' is invalid in C99 [-Wimplicit-function-declaration]
                if (unlockpt(p) < 0) {
                    ^
../slcanpty.c:486:14: warning: implicit declaration of function 'ptsname' is invalid in C99 [-Wimplicit-function-declaration]
                name_pts = ptsname(p);
                           ^
../slcanpty.c:486:12: warning: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
                name_pts = ptsname(p);
                         ^ ~~~~~~~~~~

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-29 18:20:18 +02:00
Marc Kleine-Budde a5c049d37a slcanpty: add missing include sys/select.h 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-29 18:20:18 +02:00
Marc Kleine-Budde 57949154cc slcanpty: sort includes alphabetically 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-29 18:20:11 +02:00
Marc Kleine-BuddeandGitHub 24b73044c5 Merge pull request #224 from marckleinebudde/canfdtest 
Canfdtest
 2020-06-29 18:18:18 +02:00
Marc Kleine-Budde b29a75d4c6 j1939cat: j1939cat_parse_args(): fix warning 
although it looks like a false positive:

/home/travis/build/linux-can/can-utils/j1939cat.c: In function ‘main’:
/home/travis/build/linux-can/can-utils/j1939cat.c:648:6: warning: ‘ret’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  int ret;
      ^

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 12:41:48 +02:00
Marc Kleine-Budde 0f9c69c193 can-calc-bit-timing: fix warning 
although it looks like a false positive:

/home/travis/build/linux-can/can-utils/can-calc-bit-timing.c: In function ‘print_bit_timing.isra.6’:
/home/travis/build/linux-can/can-utils/can-calc-bit-timing.c:447:42: warning: ‘tseg2’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  unsigned int brp, tsegall, tseg, tseg1, tseg2;
                                          ^
/home/travis/build/linux-can/can-utils/can-calc-bit-timing.c:447:35: warning: ‘tseg1’ may be used uninitialized in this function [-Wmaybe-uninitialized]
  unsigned int brp, tsegall, tseg, tseg1, tseg2;
                                   ^

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 12:41:48 +02:00
Marc Kleine-Budde 13ecaa6d7e canfdtest: make number of frames in flight a command line option 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 11:59:35 +02:00
Marc Kleine-Budde d7f28a0ffe canfdtest: can_echo_dut(): check received frame for consistency 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 11:38:48 +02:00
Marc Kleine-Budde e393697112 canfdtest: can_echo_dut(): move functionality to increment frame data into separate function 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 11:38:48 +02:00
Marc Kleine-Budde 645cd1b1ba canfdtest: can_echo_dut(): make use of print_frame() instead of open coding it 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 11:38:48 +02:00
Marc Kleine-Budde aa5386f1cb canfdtest: print_frame(): add missing cast to uint8_t to avoid overruns 
While there, use cast in compare_frame(), too.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 11:38:48 +02:00
Marc Kleine-Budde ff3d0e0d05 canfdtest: print_frame()/print_compare(): mark parameters "struct can_frame *" as const 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 11:38:17 +02:00
Marc Kleine-Budde 29605e3314 canfdtest: compare_frame(): remove stray space in front of "!" 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 11:26:03 +02:00
Marc Kleine-Budde d92adf68e8 canfdtest: main(): remove double ";" 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-22 11:25:21 +02:00
Marc Kleine-BuddeandGitHub 063e361cc5 Merge pull request #194 from marckleinebudde/canfdtest-initialize-tx_frames 
canfdtest: can_echo_gen(): initialize tx_frames with zero
 2020-06-17 12:53:32 +02:00
Marc Kleine-BuddeandGitHub e9e1a02085 Merge pull request #223 from marckleinebudde/jacd 
j1939acd: replace 0x0fed8 by constant J1939_PGN_ADDRESS_COMMANDED
 2020-06-17 12:51:32 +02:00
Marc Kleine-Budde 19b3ffe34b j1939acd: replace 0x0fed8 by constant J1939_PGN_ADDRESS_COMMANDED 
Reported-by: josemic <josemic@users.noreply.github.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-06-17 12:37:30 +02:00
Marc Kleine-BuddeandGitHub 6553ccaf06 Merge pull request #221 from josemic/patch-4 
Changed hardcoded hex number 0x0fed8 to j1939.h constant "J1939_PGN_ADDRESS_COMMANDED"
 2020-06-17 12:34:51 +02:00
Marc Kleine-BuddeandGitHub e15b044a1d Merge pull request #220 from olerem/j1939acd-verbose 
J1939acd verbose
 2020-06-16 14:35:57 +02:00
Marc Kleine-BuddeandGitHub 8df3d1dd3f Merge pull request #205 from josemic/patch-2 
Update j1939acd.c
 2020-05-27 09:07:24 +02:00
Marc Kleine-BuddeandGitHub 6cdccbbafc Merge pull request #199 from gerasiov/j1939rename 
Rename j* to j1939\1
 2020-04-24 13:01:51 +02:00
Marc Kleine-Budde 506f6f3043 canfdtest: can_echo_gen(): initialize tx_frames with zero 
This avoids having the padding in the struct can_fame contain bogus
values, which are interpreted by "candump -x" as CAN-FD BRS and ESI
values.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2020-02-03 23:58:34 +01:00
Marc Kleine-BuddeandGitHub 665d8699eb Merge pull request #172 from jluebbe/jluebbe-actions 
add github actions
 2019-12-06 13:55:33 +01:00
Marc Kleine-BuddeandGitHub 4e36059f6a Merge pull request #175 from olerem/testj1938 
sync testj1939 with latest kernel UAPI
 2019-12-06 11:41:10 +01:00
Marc Kleine-BuddeandGitHub 6831eeeb62 Merge pull request #180 from olerem/jacd 
jacd: remove SO_BINDTODEVICE setsockopt call
 2019-12-06 11:31:53 +01:00
Marc Kleine-BuddeandGitHub 6eeedb0e66 Merge pull request #177 from marckleinebudde/fix-error-handling 
isotpsniffer: fix error handling, "0" is a valid filedescriptor
 2019-12-02 19:16:55 +01:00
Marc Kleine-Budde b6a44803fd isotpsniffer: fix error handling, "0" is a valid filedescriptor 
Fixes: b04108c615 ("isotpsniffer: Fix error handling")
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2019-12-02 11:20:03 +01:00
Marc Kleine-BuddeandGitHub 35b2ef691c Merge pull request #163 from marckleinebudde/libmusl-fix 
treewide: Fix compilation on libmusl, replace error() by err()
 2019-10-31 08:57:29 +01:00
Marc Kleine-BuddeandGitHub a08b61621d Merge pull request #162 from josemic/patch-1 
Update can-j1939-kickstart.md
 2019-10-31 08:52:13 +01:00
Marc Kleine-Budde 791b6de786 treewide: Fix compilation on libmusl, replace error() by err() 
Reported-by: Brandon Ros <brandonros1@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2019-10-30 11:59:49 +01:00
Marc Kleine-BuddeandGitHub a8d4827d0f Merge pull request #151 from olerem/recvown 2019-08-26 14:16:05 +02:00
Marc Kleine-BuddeandGitHub c10c049ce7 Merge pull request #147 from ffontaine/master 
fix include to find SIOCGSTAMP with latest kernel
 2019-07-15 08:34:00 +02:00
Marc Kleine-BuddeandGitHub bb2cc1140f Merge pull request #144 from olerem/errq-2019.05.25 
queue status
 2019-06-27 12:05:52 +02:00
Marc Kleine-BuddeandGitHub a965086356 Merge pull request #140 from marckleinebudde/isotpdump 
isotpdump: fix compiler warning
 2019-06-03 20:26:11 +02:00
Marc Kleine-Budde 8ada533538 isotpdump: fix compiler warning 
| isotpdump.c: In function ‘print_uds_message’:
| isotpdump.c:94:29: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
|   } else if (service >= 0x10 && service <= 0x3E ||
|              ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~
| isotpdump.c:96:22: warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
|       service >= 0xBA && service <= 0xBE)
|       ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2019-06-03 19:56:27 +02:00
Marc Kleine-BuddeandGitHub 045f75ad64 Merge pull request #135 from olerem/errq-2019.05.09.1 
Provide error queue support
 2019-05-09 14:50:29 +02:00
Marc Kleine-Budde 6260263ef3 buildsystem: add SCM_TIMESTAMPING_OPT_STATS if not already defined 2019-05-09 14:40:16 +02:00
Marc Kleine-BuddeandGitHub e92806db21 Merge pull request #136 from olerem/namefix 
libj1939: fix name parsing
 2019-05-09 12:29:58 +02:00
Marc Kleine-Budde 06d3beb08c include: import header files from linux-5.0 (including new j1939 patches) 
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 2019-04-04 10:19:11 +02:00