linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / um / drivers / net_user.c

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index 107c5e4..0e2f061 100644 (file)
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -22,14 +22,13 @@ int tap_open_common(void *dev, char *gate_addr)
 {
        int tap_addr[4];
 
-       if(gate_addr == NULL)
-               return 0;
+       if(gate_addr == NULL) return(0);
        if(sscanf(gate_addr, "%d.%d.%d.%d", &tap_addr[0], 
                  &tap_addr[1], &tap_addr[2], &tap_addr[3]) != 4){
                printk("Invalid tap IP address - '%s'\n", gate_addr);
-               return -EINVAL;
+               return(-EINVAL);
        }
-       return 0;
+       return(0);
 }
 
 void tap_check_ips(char *gate_addr, unsigned char *eth_addr)
@@ -95,25 +94,25 @@ int net_read(int fd, void *buf, int len)
        n = os_read_file(fd,  buf,  len);
 
        if(n == -EAGAIN)
-               return 0;
+               return(0);
        else if(n == 0)
-               return -ENOTCONN;
-       return n;
+               return(-ENOTCONN);
+       return(n);
 }
 
 int net_recvfrom(int fd, void *buf, int len)
 {
        int n;
 
-       CATCH_EINTR(n = recvfrom(fd,  buf,  len, 0, NULL, NULL));
+       while(((n = recvfrom(fd,  buf,  len, 0, NULL, NULL)) < 0) && 
+             (errno == EINTR)) ;
+
        if(n < 0){
-               if(errno == EAGAIN)
-                       return 0;
-               return -errno;
+               if(errno == EAGAIN) return(0);
+               return(-errno);
        }
-       else if(n == 0)
-               return -ENOTCONN;
-       return n;
+       else if(n == 0) return(-ENOTCONN);
+       return(n);
 }
 
 int net_write(int fd, void *buf, int len)
@@ -123,41 +122,37 @@ int net_write(int fd, void *buf, int len)
        n = os_write_file(fd, buf, len);
 
        if(n == -EAGAIN)
-               return 0;
+               return(0);
        else if(n == 0)
-               return -ENOTCONN;
-       return n;
+               return(-ENOTCONN);
+       return(n);
 }
 
 int net_send(int fd, void *buf, int len)
 {
        int n;
 
-       CATCH_EINTR(n = send(fd, buf, len, 0));
+       while(((n = send(fd, buf, len, 0)) < 0) && (errno == EINTR)) ;
        if(n < 0){
-               if(errno == EAGAIN)
-                       return 0;
-               return -errno;
+               if(errno == EAGAIN) return(0);
+               return(-errno);
        }
-       else if(n == 0)
-               return -ENOTCONN;
-       return n;
+       else if(n == 0) return(-ENOTCONN);
+       return(n);      
 }
 
 int net_sendto(int fd, void *buf, int len, void *to, int sock_len)
 {
        int n;
 
-       CATCH_EINTR(n = sendto(fd, buf, len, 0, (struct sockaddr *) to,
-                              sock_len));
+       while(((n = sendto(fd, buf, len, 0, (struct sockaddr *) to,
+                          sock_len)) < 0) && (errno == EINTR)) ;
        if(n < 0){
-               if(errno == EAGAIN)
-                       return 0;
-               return -errno;
+               if(errno == EAGAIN) return(0);
+               return(-errno);
        }
-       else if(n == 0)
-               return -ENOTCONN;
-       return n;
+       else if(n == 0) return(-ENOTCONN);
+       return(n);      
 }
 
 struct change_pre_exec_data {
@@ -181,21 +176,19 @@ static int change_tramp(char **argv, char *output, int output_len)
        err = os_pipe(fds, 1, 0);
        if(err < 0){
                printk("change_tramp - pipe failed, err = %d\n", -err);
-               return err;
+               return(err);
        }
        pe_data.close_me = fds[0];
        pe_data.stdout = fds[1];
        pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
 
-       if (pid > 0)    /* Avoid hang as we won't get data in failure case. */
-               read_output(fds[0], output, output_len);
-
+       read_output(fds[0], output, output_len);
        os_close_file(fds[0]);
        os_close_file(fds[1]);
 
        if (pid > 0)
                CATCH_EINTR(err = waitpid(pid, NULL, 0));
-       return pid;
+       return(pid);
 }
 
 static void change(char *dev, char *what, unsigned char *addr,
@@ -246,15 +239,26 @@ char *split_if_spec(char *str, ...)
        va_start(ap, str);
        while((arg = va_arg(ap, char **)) != NULL){
                if(*str == '\0')
-                       return NULL;
+                       return(NULL);
                end = strchr(str, ',');
                if(end != str)
                        *arg = str;
                if(end == NULL)
-                       return NULL;
+                       return(NULL);
                *end++ = '\0';
                str = end;
        }
        va_end(ap);
-       return str;
+       return(str);
 }
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * Emacs will notice this stuff at the end of the file and automatically
+ * adjust the settings for this buffer only.  This must remain at the end
+ * of the file.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-file-style: "linux"
+ * End:
+ */