[SQUASH ME] ng_tapnet: some fixes

RIOT-OS · Mar 8, 2015 · 1484f5a · 1484f5a
1 parent c360146
commit 1484f5a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Makefile.dep b/Makefile.dep
@@ -49,7 +49,7 @@ ifneq (,$(filter sixlowpan,$(USEMODULE)))
 endif
 
 ifneq (,$(filter ng_tapnet,$(USEMODULE)))
-    USEMODULE += pktbuf
+    USEMODULE += ng_pktbuf
 endif
 
 ifneq (,$(filter aodvv2,$(USEMODULE)))

diff --git a/cpu/native/ng_tapnet/ng_tapnet.c b/cpu/native/ng_tapnet/ng_tapnet.c
@@ -62,7 +62,7 @@
 
 #define _ISR_EVENT_RX   (1U)
 
-extern ng_tapnet_t ng_tapnet;
+ng_tapnet_t ng_tapnet;
 
 #ifdef __MACH__
 pid_t _sigio_child_pid;

diff --git a/cpu/native/startup.c b/cpu/native/startup.c
@@ -376,7 +376,7 @@ __attribute__((constructor)) static void startup(int argc, char **argv)
     do {    /* Don't wanna have this int forever reserved ;-) */
         int res;
 
-        if ((res = ng_tapnet_init(ng_tapnet, argv[1])) < 0) {
+        if ((res = ng_tapnet_init(&ng_tapnet, argv[1], strlen(argv[1]))) < 0) {
             errno = -res;
             err(EXIT_FAILURE, "initialization ng_tapnet");
         }