git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uml: change remaining callers of os_{read_write}_file
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
net_user.c
diff --git
a/arch/um/drivers/net_user.c
b/arch/um/drivers/net_user.c
index
0ffd7ac
..
8bc6688
100644
(file)
--- a/
arch/um/drivers/net_user.c
+++ b/
arch/um/drivers/net_user.c
@@
-14,11
+14,11
@@
#include <sys/wait.h>
#include <sys/time.h>
#include "user.h"
#include <sys/wait.h>
#include <sys/time.h>
#include "user.h"
-#include "user_util.h"
#include "kern_util.h"
#include "net_user.h"
#include "os.h"
#include "um_malloc.h"
#include "kern_util.h"
#include "net_user.h"
#include "os.h"
#include "um_malloc.h"
+#include "kern_constants.h"
int tap_open_common(void *dev, char *gate_addr)
{
int tap_open_common(void *dev, char *gate_addr)
{
@@
-63,7
+63,7
@@
void read_output(int fd, char *output, int len)
}
*output = '\0';
}
*output = '\0';
- ret = os_read_file(fd, &remain, sizeof(remain));
+ ret = os_read_file
_k
(fd, &remain, sizeof(remain));
if (ret != sizeof(remain)) {
expected = sizeof(remain);
if (ret != sizeof(remain)) {
expected = sizeof(remain);
@@
-73,7
+73,7
@@
void read_output(int fd, char *output, int len)
while(remain != 0){
expected = (remain < len) ? remain : len;
while(remain != 0){
expected = (remain < len) ? remain : len;
- ret = os_read_file(fd, output, expected);
+ ret = os_read_file
_k
(fd, output, expected);
if (ret != expected) {
str = "data";
goto err;
if (ret != expected) {
str = "data";
goto err;
@@
-94,7
+94,7
@@
int net_read(int fd, void *buf, int len)
{
int n;
{
int n;
- n = os_read_file(fd, buf, len);
+ n = os_read_file
_k
(fd, buf, len);
if(n == -EAGAIN)
return 0;
if(n == -EAGAIN)
return 0;
@@
-122,7
+122,7
@@
int net_write(int fd, void *buf, int len)
{
int n;
{
int n;
- n = os_write_file(fd, buf, len);
+ n = os_write_file
_k
(fd, buf, len);
if(n == -EAGAIN)
return 0;
if(n == -EAGAIN)
return 0;
@@
-216,7
+216,7
@@
static void change(char *dev, char *what, unsigned char *addr,
sprintf(netmask_buf, "%d.%d.%d.%d", netmask[0], netmask[1],
netmask[2], netmask[3]);
sprintf(netmask_buf, "%d.%d.%d.%d", netmask[0], netmask[1],
netmask[2], netmask[3]);
- output_len =
page_size()
;
+ output_len =
UM_KERN_PAGE_SIZE
;
output = um_kmalloc(output_len);
if(output == NULL)
printk("change : failed to allocate output buffer\n");
output = um_kmalloc(output_len);
if(output == NULL)
printk("change : failed to allocate output buffer\n");