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
810654e1
Commit
810654e1
authored
9 years ago
by
Martine Lenders
Browse files
Options
Downloads
Patches
Plain Diff
ng_sixlowpan: fix the kaputt-reviewed fixes
parent
8960be10
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
+7
-7
7 additions, 7 deletions
sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
with
7 additions
and
7 deletions
sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
+
7
−
7
View file @
810654e1
...
@@ -218,7 +218,7 @@ static void _send(ng_pktsnip_t *pkt)
...
@@ -218,7 +218,7 @@ static void _send(ng_pktsnip_t *pkt)
ng_pktbuf_release
(
pkt2
);
ng_pktbuf_release
(
pkt2
);
return
;
return
;
}
}
dispatch_len
+=
1
;
dispatch_len
++
;
}
}
#else
#else
/* suppress clang-analyzer report about iface being not read */
/* suppress clang-analyzer report about iface being not read */
...
@@ -229,7 +229,7 @@ static void _send(ng_pktsnip_t *pkt)
...
@@ -229,7 +229,7 @@ static void _send(ng_pktsnip_t *pkt)
ng_pktbuf_release
(
pkt2
);
ng_pktbuf_release
(
pkt2
);
return
;
return
;
}
}
dispatch_len
+=
1
;
dispatch_len
++
;
#endif
#endif
datagram_size
=
ng_pkt_len
(
pkt2
->
next
);
datagram_size
=
ng_pkt_len
(
pkt2
->
next
);
...
@@ -238,7 +238,7 @@ static void _send(ng_pktsnip_t *pkt)
...
@@ -238,7 +238,7 @@ static void _send(ng_pktsnip_t *pkt)
/* IP should not send anything here if it is not a 6LoWPAN interface,
/* IP should not send anything here if it is not a 6LoWPAN interface,
* so we don't need to check for NULL pointers */
* so we don't need to check for NULL pointers */
if
(
(
datagram_size
+
dispatch_len
)
<=
iface
->
max_frag_size
)
{
if
(
datagram_size
<=
iface
->
max_frag_size
)
{
DEBUG
(
"6lo: Send SND command for %p to %"
PRIu16
"
\n
"
,
DEBUG
(
"6lo: Send SND command for %p to %"
PRIu16
"
\n
"
,
(
void
*
)
pkt2
,
hdr
->
if_pid
);
(
void
*
)
pkt2
,
hdr
->
if_pid
);
ng_netapi_send
(
hdr
->
if_pid
,
pkt2
);
ng_netapi_send
(
hdr
->
if_pid
,
pkt2
);
...
@@ -248,14 +248,14 @@ static void _send(ng_pktsnip_t *pkt)
...
@@ -248,14 +248,14 @@ static void _send(ng_pktsnip_t *pkt)
#ifdef MODULE_NG_SIXLOWPAN_FRAG
#ifdef MODULE_NG_SIXLOWPAN_FRAG
else
{
else
{
DEBUG
(
"6lo: Send fragmented (%u > %"
PRIu16
")
\n
"
,
DEBUG
(
"6lo: Send fragmented (%u > %"
PRIu16
")
\n
"
,
(
unsigned
int
)
datagram_size
+
dispatch_len
,
iface
->
max_frag_size
);
(
unsigned
int
)
datagram_size
,
iface
->
max_frag_size
);
ng_sixlowpan_frag_send
(
hdr
->
if_pid
,
pkt2
,
datagram_size
+
dispatch_len
,
ng_sixlowpan_frag_send
(
hdr
->
if_pid
,
pkt2
,
datagram_size
,
datagram_size
);
datagram_size
-
dispatch_len
);
}
}
#else
#else
(
void
)
datagram_size
;
(
void
)
datagram_size
;
DEBUG
(
"6lo: packet too big (%u> %"
PRIu16
")
\n
"
,
DEBUG
(
"6lo: packet too big (%u> %"
PRIu16
")
\n
"
,
(
unsigned
int
)
(
datagram_size
+
dispatch_len
)
,
iface
->
max_frag_size
);
(
unsigned
int
)
datagram_size
,
iface
->
max_frag_size
);
#endif
#endif
}
}
...
...
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