RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge #19235 #19236 #19237 #19238

Browse Source 
19235: pkg/nimble/autoadv: fix flag comparisons r=benpicco a=kaspar030



19236: sys/vfs: vfs.c missing includes r=benpicco a=kaspar030



19237: sys/net/crosslayer/inet_csum: add missing "modules.h" include r=benpicco a=kaspar030



19238: sys/net/grnc/netreg: avoid creating an infinite loop r=benpicco a=benpicco



Co-authored-by: Kaspar Schleiser <kaspar@schleiser.de>
Co-authored-by: Benjamin Valentin <benjamin.valentin@ml-pa.com>
This commit is contained in:
bors[bot] 2023-02-02 17:52:10 +00:00 committed by GitHub
commit 247b8d0a47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/nimble/autoadv/nimble_autoadv.c
View File

@ -192,11 +192,11 @@ void nimble_autoadv_start(ble_addr_t *addr)
if (addr != NULL) { if (addr != NULL) {
mode = BLE_GAP_CONN_MODE_DIR; mode = BLE_GAP_CONN_MODE_DIR;
} }
else if (_cfg.flags && NIMBLE_AUTOADV_FLAG_CONNECTABLE) { else if (_cfg.flags & NIMBLE_AUTOADV_FLAG_CONNECTABLE) {
mode = BLE_GAP_CONN_MODE_UND; mode = BLE_GAP_CONN_MODE_UND;
} }
uint8_t disc = (_cfg.flags && NIMBLE_AUTOADV_FLAG_SCANNABLE) ? BLE_GAP_CONN_MODE_DIR uint8_t disc = (_cfg.flags & NIMBLE_AUTOADV_FLAG_SCANNABLE) ? BLE_GAP_CONN_MODE_DIR
: BLE_GAP_CONN_MODE_UND; : BLE_GAP_CONN_MODE_UND;
struct ble_gap_adv_params advp = { struct ble_gap_adv_params advp = {
.conn_mode = mode, .conn_mode = mode,
.disc_mode = disc, .disc_mode = disc,

2
sys/net/crosslayer/inet_csum/inet_csum.c
View File

@ -14,6 +14,8 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include "modules.h"
#include "od.h" #include "od.h"
#include "net/inet_csum.h" #include "net/inet_csum.h"

7
sys/net/gnrc/netreg/gnrc_netreg.c
View File

@ -152,6 +152,13 @@ int gnrc_netreg_register(gnrc_nettype_t type, gnrc_netreg_entry_t *entry)
} }
_gnrc_netreg_acquire_exclusive(); _gnrc_netreg_acquire_exclusive();
/* don't add the same entry twice */
gnrc_netreg_entry_t *e;
LL_FOREACH(netreg[type], e) {
assert(entry != e);
}
LL_PREPEND(netreg[type], entry); LL_PREPEND(netreg[type], entry);
_gnrc_netreg_release_exclusive(); _gnrc_netreg_release_exclusive();

2
sys/vfs/vfs.c
View File

@ -23,6 +23,8 @@
#include <fcntl.h> /* for O_ACCMODE, ..., fcntl */ #include <fcntl.h> /* for O_ACCMODE, ..., fcntl */
#include <unistd.h> /* for STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO */ #include <unistd.h> /* for STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO */
#include "container.h"
#include "modules.h"
#include "vfs.h" #include "vfs.h"
#include "mutex.h" #include "mutex.h"
#include "thread.h" #include "thread.h"