Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ng_rpl: port to the new network stack #3050

Merged
merged 3 commits into from
Aug 18, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Makefile.dep
Original file line number Diff line number Diff line change
Expand Up @@ -258,3 +258,13 @@ endif
ifneq (,$(filter hih6130,$(USEMODULE)))
USEMODULE += vtimer
endif

ifneq (,$(filter ng_rpl,$(USEMODULE)))
USEMODULE += timex
USEMODULE += vtimer
USEMODULE += ng_ipv6_router_default
USEMODULE += trickle
USEMODULE += net_help
USEMODULE += universal_address
USEMODULE += fib
endif
5 changes: 3 additions & 2 deletions examples/gnrc_networking/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ BOARD_INSUFFICIENT_RAM := airfy-beacon chronos msb-430 msb-430h nrf51dongle \
stm32f0discovery telosb wsn430-v1_3b wsn430-v1_4 \
yunjia-nrf51822 z1

BOARD_BLACKLIST := arduino-mega2560
BOARD_BLACKLIST := arduino-mega2560 spark-core
# arduino-mega2560: unknown error types (e.g. -EBADMSG)

# Include packages that pull up and auto-init the link layer.
Expand All @@ -22,11 +22,12 @@ USEMODULE += auto_init_ng_netif
# Specify the mandatory networking modules for IPv6 and UDP
USEMODULE += ng_ipv6_router_default
USEMODULE += ng_udp
# Add a routing protocol
USEMODULE += ng_rpl
# This application dumps received packets to STDIO using the pktdump module
USEMODULE += ng_pktdump
# Additional networking modules that can be dropped if not needed
USEMODULE += ng_icmpv6_echo
USEMODULE += fib
# Add also the shell, some shell commands (which are based on uart0 in this app)
USEMODULE += uart0
USEMODULE += shell
Expand Down
3 changes: 3 additions & 0 deletions sys/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ endif
ifneq (,$(filter ng_zep,$(USEMODULE)))
DIRS += net/application_layer/ng_zep
endif
ifneq (,$(filter ng_rpl,$(USEMODULE)))
DIRS += net/routing/ng_rpl
endif
ifneq (,$(filter ng_rpl_srh,$(USEMODULE)))
DIRS += net/routing/ng_rpl/srh
endif
Expand Down
4 changes: 2 additions & 2 deletions sys/include/net/ng_ipv6/netif.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ extern "C" {
*/
#ifndef NG_IPV6_NETIF_ADDR_NUMOF
#ifdef MODULE_NG_IPV6_ROUTER
#define NG_IPV6_NETIF_ADDR_NUMOF (7) /* router needs all-routers multicast address */
#define NG_IPV6_NETIF_ADDR_NUMOF (8) /* router needs all-routers multicast address */
#else
#define NG_IPV6_NETIF_ADDR_NUMOF (6)
#define NG_IPV6_NETIF_ADDR_NUMOF (7)
#endif
#endif

Expand Down
Loading