Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cm-projects
RIOT
Commits
810608e4
Unverified
Commit
810608e4
authored
7 years ago
by
Martine Lenders
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #8335 from OTAkeys/pr/can_fix_fall_through
can: fix fall through error
parents
03fdaaeb
fb393905
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sys/can/conn/isotp.c
+1
-1
1 addition, 1 deletion
sys/can/conn/isotp.c
sys/can/isotp/isotp.c
+1
-0
1 addition, 0 deletions
sys/can/isotp/isotp.c
with
2 additions
and
1 deletion
sys/can/conn/isotp.c
+
1
−
1
View file @
810608e4
...
@@ -174,7 +174,7 @@ int conn_can_isotp_send(conn_can_isotp_t *conn, const void *buf, size_t size, in
...
@@ -174,7 +174,7 @@ int conn_can_isotp_send(conn_can_isotp_t *conn, const void *buf, size_t size, in
if
(
msg
.
content
.
ptr
==
conn
)
{
if
(
msg
.
content
.
ptr
==
conn
)
{
ret
=
-
EIO
;
ret
=
-
EIO
;
}
}
/*
No break
*/
/*
Fall through
*/
case
CAN_MSG_TX_CONFIRMATION
:
case
CAN_MSG_TX_CONFIRMATION
:
#ifdef MODULE_CONN_CAN_ISOTP_MULTI
#ifdef MODULE_CONN_CAN_ISOTP_MULTI
if
(
msg
.
content
.
ptr
!=
conn
)
{
if
(
msg
.
content
.
ptr
!=
conn
)
{
...
...
This diff is collapsed.
Click to expand it.
sys/can/isotp/isotp.c
+
1
−
0
View file @
810608e4
...
@@ -609,6 +609,7 @@ static void _isotp_rx_timeout_task(struct isotp *isotp)
...
@@ -609,6 +609,7 @@ static void _isotp_rx_timeout_task(struct isotp *isotp)
case
ISOTP_SENDING_FC
:
case
ISOTP_SENDING_FC
:
DEBUG
(
"_isotp_rx_timeout_task: FC tx conf timeout
\n
"
);
DEBUG
(
"_isotp_rx_timeout_task: FC tx conf timeout
\n
"
);
raw_can_abort
(
isotp
->
entry
.
ifnum
,
isotp
->
rx
.
tx_handle
);
raw_can_abort
(
isotp
->
entry
.
ifnum
,
isotp
->
rx
.
tx_handle
);
/* Fall through */
case
ISOTP_WAIT_CF
:
case
ISOTP_WAIT_CF
:
DEBUG
(
"_isotp_rx_timeout_task: free rx buf
\n
"
);
DEBUG
(
"_isotp_rx_timeout_task: free rx buf
\n
"
);
gnrc_pktbuf_release
(
isotp
->
rx
.
snip
);
gnrc_pktbuf_release
(
isotp
->
rx
.
snip
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment