Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-08-17 18:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merged nuttx/nuttx into master

Browse source
This commit is contained in:
Masayuki Ishikawa 2017-05-18 21:14:42 +09:00
commit 19e1d98734
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mm/iob/iob_alloc_qentry.c
View file

@ -82,7 +82,7 @@ static FAR struct iob_qentry_s *iob_alloc_qcommitted(void)
{
/* Remove the I/O buffer from the committed list */
g_iob_qcommitted = iobq->io_flink;
g_iob_qcommitted = iobq->qe_flink;
/* Put the I/O buffer in a known state */

2
mm/iob/iob_initialize.c
View file

@ -84,7 +84,7 @@ FAR struct iob_qentry_s *g_iob_freeqlist;
/* A list of I/O buffer queue containers that are committed for allocation */
extern FAR struct iob_s *g_iob_qcommitted;
FAR struct iob_s *g_iob_qcommitted;
#endif
/* Counting semaphores that tracks the number of free IOBs/qentries */

8
net/utils/net_ipv6_pref2mask.c
View file

@ -82,7 +82,7 @@ void net_ipv6_pref2mask(uint8_t preflen, net_ipv6addr_t mask)
* 1..6 7..2 3..8 9..4 5..0 1..6 7..2 3..8
*/
for (i = 0; i < 7; i++)
for (i = 0; i < 8; i++)
{
/* bit = {0, 16, 32, 48, 64, 80, 96, 112} */
@ -92,7 +92,7 @@ void net_ipv6_pref2mask(uint8_t preflen, net_ipv6addr_t mask)
{
/* Eg. preflen = 38, bit = {0, 16, 32} */
if (preflen > (bit + 16))
if (preflen >= (bit + 16))
{
/* Eg. preflen = 38, bit = {0, 16} */
@ -102,7 +102,7 @@ void net_ipv6_pref2mask(uint8_t preflen, net_ipv6addr_t mask)
{
/* Eg. preflen = 38, bit = {32}
* bit - preflen = 6
* make = 0xffff << (16-6)
* mask = 0xffff << (16-6)
* = 0xfc00
*/
@ -111,7 +111,7 @@ void net_ipv6_pref2mask(uint8_t preflen, net_ipv6addr_t mask)
}
else
{
/* Eg. preflen=38, bit= {48, 64, 80, 112} */
/* Eg. preflen=38, bit= {48, 64, 80, 96, 112} */
mask[i] = 0x0000;
}