From 09b1abcb4e9e9944b89c3fdeb1b928131be18606 Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Tue, 10 Mar 2015 09:22:23 +0100 Subject: [PATCH] ng_netreg: Allow registration of NG_NETTYPE_UNDEF --- sys/net/crosslayer/ng_netreg/ng_netreg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/net/crosslayer/ng_netreg/ng_netreg.c b/sys/net/crosslayer/ng_netreg/ng_netreg.c index a704e4979f..4b5f26aea8 100644 --- a/sys/net/crosslayer/ng_netreg/ng_netreg.c +++ b/sys/net/crosslayer/ng_netreg/ng_netreg.c @@ -20,10 +20,10 @@ #include "net/ng_nettype.h" #include "utlist.h" -#define _INVALID_TYPE(type) (((type) <= NG_NETTYPE_UNDEF) || ((type) >= NG_NETTYPE_NUMOF)) +#define _INVALID_TYPE(type) (((type) < NG_NETTYPE_UNDEF) || ((type) >= NG_NETTYPE_NUMOF)) /* The registry as lookup table by ng_nettype_t */ -static ng_netreg_entry_t *netreg[NG_NETTYPE_NUMOF - 1]; /* leave out NG_NETTYPE_UNDEF */ +static ng_netreg_entry_t *netreg[NG_NETTYPE_NUMOF]; void ng_netreg_init(void) { @@ -37,7 +37,7 @@ int ng_netreg_register(ng_nettype_t type, ng_netreg_entry_t *entry) return -EINVAL; } - LL_PREPEND(netreg[type - 1], entry); + LL_PREPEND(netreg[type], entry); return 0; } @@ -48,7 +48,7 @@ void ng_netreg_unregister(ng_nettype_t type, ng_netreg_entry_t *entry) return; } - LL_DELETE(netreg[type - 1], entry); + LL_DELETE(netreg[type], entry); } ng_netreg_entry_t *ng_netreg_lookup(ng_nettype_t type, uint32_t demux_ctx) @@ -59,7 +59,7 @@ ng_netreg_entry_t *ng_netreg_lookup(ng_nettype_t type, uint32_t demux_ctx) return NULL; } - LL_SEARCH_SCALAR(netreg[type - 1], res, demux_ctx, demux_ctx); + LL_SEARCH_SCALAR(netreg[type], res, demux_ctx, demux_ctx); return res; } @@ -73,7 +73,7 @@ int ng_netreg_num(ng_nettype_t type, uint32_t demux_ctx) return 0; } - entry = netreg[type - 1]; + entry = netreg[type]; while (entry != NULL) { if (entry->demux_ctx == demux_ctx) {