fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / um / os-Linux / drivers / ethertap_user.c

diff --git a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
index 901b85e..863981b 100644 (file)
--- a/arch/um/os-Linux/drivers/ethertap_user.c
+++ b/arch/um/os-Linux/drivers/ethertap_user.c
@@ -20,6 +20,7 @@
 #include "net_user.h"
 #include "etap.h"
 #include "os.h"
+#include "um_malloc.h"
 
 #define MAX_PACKET ETH_MAX_PACKET
 
@@ -40,7 +41,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
                        int fd)
 {
        struct addr_change change;
-       void *output;
+       char *output;
        int n;
 
        change.what = op;
@@ -216,7 +217,7 @@ static void etap_del_addr(unsigned char *addr, unsigned char *netmask,
        etap_close_addr(addr, netmask, &pri->control_fd);
 }
 
-struct net_user_info ethertap_user_info = {
+const struct net_user_info ethertap_user_info = {
        .init           = etap_user_init,
        .open           = etap_open,
        .close          = etap_close,