summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2019-07-12 07:10:18 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-07-12 07:10:18 +0200
commit0d574a84aea7d73e0b2bbc3cea23668c654a8d43 (patch)
treebd52b54256ac2fd558abe4e09e9bb64c4e56b135
parentcab56acd98643d7cf08ab992cbb0557b4c2488f7 (diff)
parenta04d27474c50c08d917a831c9cc7e1b27e3599ff (diff)
downloadbarebox-0d574a84aea7d73e0b2bbc3cea23668c654a8d43.tar.gz
barebox-0d574a84aea7d73e0b2bbc3cea23668c654a8d43.tar.xz
Merge branch 'for-next/sandbox'
-rw-r--r--arch/sandbox/board/board.c1
-rw-r--r--arch/sandbox/board/console.c1
-rw-r--r--arch/sandbox/board/devices.c1
-rw-r--r--arch/sandbox/mach-sandbox/include/mach/linux.h2
-rw-r--r--arch/sandbox/os/tap.c3
5 files changed, 3 insertions, 5 deletions
diff --git a/arch/sandbox/board/board.c b/arch/sandbox/board/board.c
index dcad3c249b..1f6392d15e 100644
--- a/arch/sandbox/board/board.c
+++ b/arch/sandbox/board/board.c
@@ -58,4 +58,3 @@ static int devices_init(void)
}
device_initcall(devices_init);
-
diff --git a/arch/sandbox/board/console.c b/arch/sandbox/board/console.c
index 006bbd1a6e..4b251e9087 100644
--- a/arch/sandbox/board/console.c
+++ b/arch/sandbox/board/console.c
@@ -40,4 +40,3 @@ int barebox_register_console(int stdinfd, int stdoutfd)
return sandbox_add_device(dev);
}
-
diff --git a/arch/sandbox/board/devices.c b/arch/sandbox/board/devices.c
index 10d6b67cc4..242a0d718e 100644
--- a/arch/sandbox/board/devices.c
+++ b/arch/sandbox/board/devices.c
@@ -6,6 +6,7 @@
#include <common.h>
#include <driver.h>
+#include <mach/linux.h>
#include <init.h>
static LIST_HEAD(sandbox_device_list);
diff --git a/arch/sandbox/mach-sandbox/include/mach/linux.h b/arch/sandbox/mach-sandbox/include/mach/linux.h
index 52360f8771..7d0ed55735 100644
--- a/arch/sandbox/mach-sandbox/include/mach/linux.h
+++ b/arch/sandbox/mach-sandbox/include/mach/linux.h
@@ -8,7 +8,7 @@ int sandbox_add_device(struct device_d *dev);
struct fb_bitfield;
int linux_register_device(const char *name, void *start, void *end);
-int tap_alloc(char *dev);
+int tap_alloc(const char *dev);
uint64_t linux_get_time(void);
int linux_read(int fd, void *buf, size_t count);
int linux_read_nonblock(int fd, void *buf, size_t count);
diff --git a/arch/sandbox/os/tap.c b/arch/sandbox/os/tap.c
index 0e29e8e8ad..3a29a4be64 100644
--- a/arch/sandbox/os/tap.c
+++ b/arch/sandbox/os/tap.c
@@ -28,7 +28,7 @@
#include <linux/if_tun.h>
#include <string.h>
-int tap_alloc(char *dev)
+int tap_alloc(const char *dev)
{
struct ifreq ifr;
int fd, err;
@@ -55,7 +55,6 @@ int tap_alloc(char *dev)
return err;
}
- strcpy(dev, ifr.ifr_name);
return fd;
}