uml: network formatting

Style and other non-functional changes in the UML networking code, including
	include tidying
	style violations
	copyright updates
	printks getting severities
	userspace code calling libc directly rather than using the os_*
wrappers

There's also a exit path cleanup in the pcap driver.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 30 insertions, 32 deletions

diff --git a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
index 236a3dfc297d..e427b5322a36 100644
--- a/arch/um/drivers/mcast_user.c
+++ b/arch/um/drivers/mcast_user.c
@@ -1,9 +1,10 @@
 /*
  * user-mode-linux networking multicast transport
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Copyright (C) 2001 by Harald Welte <laforge@gnumonks.org>
  *
  * based on the existing uml-networking code, which is
- * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and 
+ * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
  * James Leu (jleu@mindspring.net).
  * Copyright (C) 2001 by various other people who didn't put their name here.
  *
@@ -11,18 +12,13 @@
  *
  */
 
-#include <errno.h>
 #include <unistd.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
+#include <errno.h>
 #include <netinet/in.h>
-#include "net_user.h"
 #include "mcast.h"
-#include "kern_util.h"
-#include "user.h"
-#include "os.h"
+#include "net_user.h"
 #include "um_malloc.h"
+#include "user.h"
 
 #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
 
@@ -31,8 +27,9 @@ static struct sockaddr_in *new_addr(char *addr, unsigned short port)
         struct sockaddr_in *sin;
 
         sin = kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
-        if(sin == NULL){
-                printk("new_addr: allocation of sockaddr_in failed\n");
+        if (sin == NULL) {
+                printk(UM_KERN_ERR "new_addr: allocation of sockaddr_in "
+                       "failed\n");
                 return NULL;
         }
         sin->sin_family = AF_INET;
@@ -71,17 +68,17 @@ static int mcast_open(void *data)
 
         fd = socket(AF_INET, SOCK_DGRAM, 0);
 
-        if (fd < 0){
+        if (fd < 0) {
                 err = -errno;
-                printk("mcast_open : data socket failed, errno = %d\n", 
-                       errno);
+                printk(UM_KERN_ERR "mcast_open : data socket failed, "
+                       "errno = %d\n", errno);
                 goto out;
         }
 
         if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
                 err = -errno;
-                printk("mcast_open: SO_REUSEADDR failed, errno = %d\n",
-                        errno);
+                printk(UM_KERN_ERR "mcast_open: SO_REUSEADDR failed, "
+                       "errno = %d\n", errno);
                 goto out_close;
         }
 
@@ -89,45 +86,46 @@ static int mcast_open(void *data)
         if (setsockopt(fd, SOL_IP, IP_MULTICAST_TTL, &pri->ttl,
                        sizeof(pri->ttl)) < 0) {
                 err = -errno;
-                printk("mcast_open: IP_MULTICAST_TTL failed, error = %d\n",
-                        errno);
+                printk(UM_KERN_ERR "mcast_open: IP_MULTICAST_TTL failed, "
+                       "error = %d\n", errno);
                 goto out_close;
         }
 
         /* set LOOP, so data does get fed back to local sockets */
         if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
                 err = -errno;
-                printk("mcast_open: IP_MULTICAST_LOOP failed, error = %d\n",
-                        errno);
+                printk(UM_KERN_ERR "mcast_open: IP_MULTICAST_LOOP failed, "
+                       "error = %d\n", errno);
                 goto out_close;
         }
 
         /* bind socket to mcast address */
         if (bind(fd, (struct sockaddr *) sin, sizeof(*sin)) < 0) {
                 err = -errno;
-                printk("mcast_open : data bind failed, errno = %d\n", errno);
+                printk(UM_KERN_ERR "mcast_open : data bind failed, "
+                       "errno = %d\n", errno);
                 goto out_close;
         }
 
         /* subscribe to the multicast group */
         mreq.imr_multiaddr.s_addr = sin->sin_addr.s_addr;
         mreq.imr_interface.s_addr = 0;
-        if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP, 
+        if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP,
                        &mreq, sizeof(mreq)) < 0) {
                 err = -errno;
-                printk("mcast_open: IP_ADD_MEMBERSHIP failed, error = %d\n",
-                        errno);
-                printk("There appears not to be a multicast-capable network "
-                       "interface on the host.\n");
-                printk("eth0 should be configured in order to use the "
-                       "multicast transport.\n");
+                printk(UM_KERN_ERR "mcast_open: IP_ADD_MEMBERSHIP failed, "
+                       "error = %d\n", errno);
+                printk(UM_KERN_ERR "There appears not to be a multicast-"
+                       "capable network interface on the host.\n");
+                printk(UM_KERN_ERR "eth0 should be configured in order to use "
+                       "the multicast transport.\n");
                 goto out_close;
         }
 
         return fd;
 
  out_close:
-        os_close_file(fd);
+        close(fd);
  out:
         return err;
 }
@@ -142,11 +140,11 @@ static void mcast_close(int fd, void *data)
         mreq.imr_interface.s_addr = 0;
         if (setsockopt(fd, SOL_IP, IP_DROP_MEMBERSHIP,
                        &mreq, sizeof(mreq)) < 0) {
-                printk("mcast_open: IP_DROP_MEMBERSHIP failed, error = %d\n",
-                        errno);
+                printk(UM_KERN_ERR "mcast_open: IP_DROP_MEMBERSHIP failed, "
+                       "error = %d\n", errno);
         }
 
-        os_close_file(fd);
+        close(fd);
 }
 
 int mcast_user_write(int fd, void *buf, int len, struct mcast_data *pri)