riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ng_{sixlowpan|ipv6}_netif: don't create ng_sixlowpan_netif_ts adhoc

Browse Source
This commit is contained in:
Martine Lenders 2015-07-23 16:55:24 +02:00
parent dc2113d67a
commit c6fb2618c4
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/net/network_layer/ng_ipv6/netif/ng_ipv6_netif.c
View File

@ -26,6 +26,7 @@
#include "net/ng_netapi.h" #include "net/ng_netapi.h"
#include "net/ng_netif.h" #include "net/ng_netif.h"
#include "net/ng_netif/hdr.h" #include "net/ng_netif/hdr.h"
#include "net/ng_sixlowpan/netif.h"
#include "net/ng_ipv6/netif.h" #include "net/ng_ipv6/netif.h"
@ -474,14 +475,24 @@ void ng_ipv6_netif_init_by_dev(void)
sizeof(if_type)) != -ENOTSUP) && sizeof(if_type)) != -ENOTSUP) &&
(if_type == NG_NETTYPE_SIXLOWPAN)) { (if_type == NG_NETTYPE_SIXLOWPAN)) {
uint16_t src_len = 8; uint16_t src_len = 8;
DEBUG("Set 6LoWPAN flag\n"); uint16_t max_frag_size = UINT16_MAX;
DEBUG("ipv6 netif: Set 6LoWPAN flag\n");
ipv6_ifs[i].flags |= NG_IPV6_NETIF_FLAGS_SIXLOWPAN; ipv6_ifs[i].flags |= NG_IPV6_NETIF_FLAGS_SIXLOWPAN;
/* use EUI-64 (8-byte address) for IID generation and for sending /* use EUI-64 (8-byte address) for IID generation and for sending
* packets */ * packets */
ng_netapi_set(ifs[i], NG_NETOPT_SRC_LEN, 0, &src_len, ng_netapi_set(ifs[i], NG_NETOPT_SRC_LEN, 0, &src_len,
sizeof(src_len)); /* don't care for result */ sizeof(src_len)); /* don't care for result */
}
if (ng_netapi_get(ifs[i], NG_NETOPT_MAX_PACKET_SIZE,
0, &max_frag_size, sizeof(max_frag_size)) < 0) {
/* if error we assume it works */
DEBUG("ipv6 netif: Can not get max packet size from interface %"
PRIkernel_pid "\n", ifs[i]);
}
ng_sixlowpan_netif_add(ifs[i], max_frag_size);
}
#endif #endif
if ((ng_netapi_get(ifs[i], NG_NETOPT_IPV6_IID, 0, &iid, if ((ng_netapi_get(ifs[i], NG_NETOPT_IPV6_IID, 0, &iid,

16
sys/net/network_layer/ng_sixlowpan/ng_sixlowpan.c
View File

@ -196,19 +196,9 @@ static void _send(ng_pktsnip_t *pkt)
iface = ng_sixlowpan_netif_get(hdr->if_pid); iface = ng_sixlowpan_netif_get(hdr->if_pid);
if (iface == NULL) { if (iface == NULL) {
if (ng_netapi_get(hdr->if_pid, NG_NETOPT_MAX_PACKET_SIZE, DEBUG("6lo: Can not get 6LoWPAN specific interface information.\n");
0, &max_frag_size, sizeof(max_frag_size)) < 0) { ng_pktbuf_release(pkt);
/* if error we assume it works */ return;
DEBUG("6lo: can not get max packet size from interface %"
PRIkernel_pid "\n", hdr->if_pid);
max_frag_size = UINT16_MAX;
}
ng_sixlowpan_netif_add(hdr->if_pid, max_frag_size);
iface = ng_sixlowpan_netif_get(hdr->if_pid);
}
else {
max_frag_size = iface->max_frag_size;
} }
#ifdef MODULE_NG_SIXLOWPAN_IPHC #ifdef MODULE_NG_SIXLOWPAN_IPHC