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

sys/net/gnrc/netif: use container_of()

Browse Source 
Using `container_of()` to translate from `netif_t *` to the containing
`gnrc_netif_t *` adds a bit of plausibility: It will fail when `gnrc_netif_t`
stops to contain `netif_t` as member. Additionally, this silences false
positives of -Wcast-align
This commit is contained in:
Marian Buschsieweke 2021-01-13 10:09:45 +01:00
parent 581aa6b70b
commit b1114b0674
No known key found for this signature in database
GPG Key ID: CB8E3238CE715A94
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/net/gnrc/netif/_netif.c
View File

@ -18,6 +18,7 @@
#include <string.h>
#include "fmt.h"
#include "kernel_defines.h"
#include "net/gnrc/netapi.h"
#include "net/gnrc/netif/internal.h"
@ -25,7 +26,7 @@
int netif_get_name(netif_t *iface, char *name)
{
gnrc_netif_t *netif = (gnrc_netif_t*) iface;
gnrc_netif_t *netif = container_of(iface, gnrc_netif_t, netif);
int res = 0;
res += fmt_u16_dec(&name[res], netif->pid);
@ -33,10 +34,10 @@ int netif_get_name(netif_t *iface, char *name)
return res;
}
int16_t netif_get_id(const netif_t *netif)
int16_t netif_get_id(const netif_t *iface)
{
const gnrc_netif_t *iface = (const gnrc_netif_t*)netif;
return iface->pid;
const gnrc_netif_t *netif = container_of(iface, gnrc_netif_t, netif);
return netif->pid;
}
netif_t *netif_get_by_id(int16_t id)
@ -44,18 +45,18 @@ netif_t *netif_get_by_id(int16_t id)
return &gnrc_netif_get_by_pid((kernel_pid_t)id)->netif;
}
int netif_get_opt(netif_t *netif, netopt_t opt, uint16_t context,
int netif_get_opt(netif_t *iface, netopt_t opt, uint16_t context,
void *value, size_t max_len)
{
gnrc_netif_t *iface = (gnrc_netif_t*) netif;
return gnrc_netapi_get(iface->pid, opt, context, value, max_len);
const gnrc_netif_t *netif = container_of(iface, gnrc_netif_t, netif);
return gnrc_netapi_get(netif->pid, opt, context, value, max_len);
}
int netif_set_opt(netif_t *netif, netopt_t opt, uint16_t context,
int netif_set_opt(netif_t *iface, netopt_t opt, uint16_t context,
void *value, size_t value_len)
{
gnrc_netif_t *iface = (gnrc_netif_t*) netif;
return gnrc_netapi_set(iface->pid, opt, context, value, value_len);
const gnrc_netif_t *netif = container_of(iface, gnrc_netif_t, netif);
return gnrc_netapi_set(netif->pid, opt, context, value, value_len);
}
/** @} */

3
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -139,7 +139,8 @@ unsigned gnrc_netif_numof(void)
gnrc_netif_t *gnrc_netif_iter(const gnrc_netif_t *prev)
{
return (gnrc_netif_t*) netif_iter((netif_t*) prev);
netif_t *result = netif_iter(&prev->netif);
return container_of(result, gnrc_netif_t, netif);
}
gnrc_netif_t *gnrc_netif_get_by_type(netdev_type_t type, uint8_t index)