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>

arch/um/drivers/daemon.h

@@ -1,8 +1,11 @@
 /*
- * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
+#ifndef __DAEMON_H__
+#define __DAEMON_H__
+
 #include "net_user.h"
 
 #define SWITCH_VERSION 3
@@ -23,13 +26,4 @@ extern const struct net_user_info daemon_user_info;
 extern int daemon_user_write(int fd, void *buf, int len,
 			     struct daemon_data *pri);
 
-/*
+#endif
- * 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:
- */

arch/um/drivers/daemon_kern.c

@@ -1,16 +1,14 @@
 /*
  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
  * James Leu (jleu@mindspring.net).
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Copyright (C) 2001 by various other people who didn't put their name here.
  * Licensed under the GPL.
  */
 
-#include "linux/kernel.h"
 #include "linux/init.h"
-#include "linux/netdevice.h"
+#include <linux/netdevice.h>
-#include "linux/etherdevice.h"
 #include "net_kern.h"
-#include "net_user.h"
 #include "daemon.h"
 
 struct daemon_init {
@@ -45,16 +43,17 @@ static int daemon_read(int fd, struct sk_buff **skb,
 		       struct uml_net_private *lp)
 {
 	*skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
-	if(*skb == NULL) return(-ENOMEM);
+	if (*skb == NULL)
-	return(net_recvfrom(fd, skb_mac_header(*skb),
+		return -ENOMEM;
-			    (*skb)->dev->mtu + ETH_HEADER_OTHER));
+	return net_recvfrom(fd, skb_mac_header(*skb),
+			    (*skb)->dev->mtu + ETH_HEADER_OTHER);
 }
 
 static int daemon_write(int fd, struct sk_buff **skb,
 			struct uml_net_private *lp)
 {
-	return(daemon_user_write(fd, (*skb)->data, (*skb)->len, 
+	return daemon_user_write(fd, (*skb)->data, (*skb)->len,
-				 (struct daemon_data *) &lp->user));
+				 (struct daemon_data *) &lp->user);
 }
 
 static const struct net_kern_info daemon_kern_info = {
@@ -79,7 +78,7 @@ static int daemon_setup(char *str, char **mac_out, void *data)
 		printk(KERN_WARNING "daemon_setup : Ignoring data socket "
 		       "specification\n");
 
-	return(1);
+	return 1;
 }
 
 static struct transport daemon_transport = {

arch/um/drivers/daemon_user.c

@@ -1,22 +1,23 @@
 /*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * 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.
  * Licensed under the GPL.
  */
 
-#include <errno.h>
-#include <unistd.h>
 #include <stdint.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <sys/time.h>
-#include "net_user.h"
+#include <sys/un.h>
 #include "daemon.h"
-#include "kern_util.h"
+#include "net_user.h"
-#include "user.h"
 #include "os.h"
 #include "um_malloc.h"
+#include "user.h"
 
 #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
 
@@ -37,7 +38,8 @@ static struct sockaddr_un *new_addr(void *name, int len)
 
 	sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
 	if (sun == NULL) {
-		printk("new_addr: allocation of sockaddr_un failed\n");
+		printk(UM_KERN_ERR "new_addr: allocation of sockaddr_un "
+		       "failed\n");
 		return NULL;
 	}
 	sun->sun_family = AF_UNIX;
@@ -56,36 +58,37 @@ static int connect_to_switch(struct daemon_data *pri)
 	pri->control = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (pri->control < 0) {
 		err = -errno;
-		printk("daemon_open : control socket failed, errno = %d\n", 
+		printk(UM_KERN_ERR "daemon_open : control socket failed, "
-		       -err);
+		       "errno = %d\n", -err);
 		return err;
 	}
 
 	if (connect(pri->control, (struct sockaddr *) ctl_addr,
 		   sizeof(*ctl_addr)) < 0) {
 		err = -errno;
-		printk("daemon_open : control connect failed, errno = %d\n",
+		printk(UM_KERN_ERR "daemon_open : control connect failed, "
-		       -err);
+		       "errno = %d\n", -err);
 		goto out;
 	}
 
 	fd = socket(AF_UNIX, SOCK_DGRAM, 0);
 	if (fd < 0) {
 		err = -errno;
-		printk("daemon_open : data socket failed, errno = %d\n",
+		printk(UM_KERN_ERR "daemon_open : data socket failed, "
-		       -err);
+		       "errno = %d\n", -err);
 		goto out;
 	}
 	if (bind(fd, (struct sockaddr *) local_addr, sizeof(*local_addr)) < 0) {
 		err = -errno;
-		printk("daemon_open : data bind failed, errno = %d\n",
+		printk(UM_KERN_ERR "daemon_open : data bind failed, "
-		       -err);
+		       "errno = %d\n", -err);
 		goto out_close;
 	}
 
 	sun = kmalloc(sizeof(struct sockaddr_un), UM_GFP_KERNEL);
 	if (sun == NULL) {
-		printk("new_addr: allocation of sockaddr_un failed\n");
+		printk(UM_KERN_ERR "new_addr: allocation of sockaddr_un "
+		       "failed\n");
 		err = -ENOMEM;
 		goto out_close;
 	}
@@ -94,18 +97,18 @@ static int connect_to_switch(struct daemon_data *pri)
 	req.version = SWITCH_VERSION;
 	req.type = REQ_NEW_CONTROL;
 	req.sock = *local_addr;
-	n = os_write_file(pri->control, &req, sizeof(req));
+	n = write(pri->control, &req, sizeof(req));
 	if (n != sizeof(req)) {
-		printk("daemon_open : control setup request failed, err = %d\n",
+		printk(UM_KERN_ERR "daemon_open : control setup request "
-		       -n);
+		       "failed, err = %d\n", -errno);
 		err = -ENOTCONN;
 		goto out_free;
 	}
 
-	n = os_read_file(pri->control, sun, sizeof(*sun));
+	n = read(pri->control, sun, sizeof(*sun));
 	if (n != sizeof(*sun)) {
-		printk("daemon_open : read of data socket failed, err = %d\n",
+		printk(UM_KERN_ERR "daemon_open : read of data socket failed, "
-		       -n);
+		       "err = %d\n", -errno);
 		err = -ENOTCONN;
 		goto out_free;
 	}
@@ -116,9 +119,9 @@ static int connect_to_switch(struct daemon_data *pri)
  out_free:
 	kfree(sun);
  out_close:
-	os_close_file(fd);
+	close(fd);
  out:
-	os_close_file(pri->control);
+	close(pri->control);
 	return err;
 }
 
@@ -161,9 +164,9 @@ static void daemon_remove(void *data)
 {
 	struct daemon_data *pri = data;
 
-	os_close_file(pri->fd);
+	close(pri->fd);
 	pri->fd = -1;
-	os_close_file(pri->control);
+	close(pri->control);
 	pri->control = -1;
 
 	kfree(pri->data_addr);

arch/um/drivers/mcast.h

@@ -1,8 +1,11 @@
 /* 
- * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
+#ifndef __DRIVERS_MCAST_H
+#define __DRIVERS_MCAST_H
+
 #include "net_user.h"
 
 struct mcast_data {
@@ -18,13 +21,4 @@ extern const struct net_user_info mcast_user_info;
 extern int mcast_user_write(int fd, void *buf, int len, 
 			    struct mcast_data *pri);
 
-/*
+#endif
- * 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:
- */

arch/um/drivers/mcast_kern.c

@@ -1,6 +1,7 @@
 /*
  * user-mode-linux networking multicast transport
  * Copyright (C) 2001 by Harald Welte <laforge@gnumonks.org>
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  *
  * based on the existing uml-networking code, which is
  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
@@ -10,15 +11,10 @@
  * Licensed under the GPL.
  */
 
-#include "linux/kernel.h"
 #include "linux/init.h"
-#include "linux/netdevice.h"
+#include <linux/netdevice.h>
-#include "linux/etherdevice.h"
-#include "linux/in.h"
-#include "linux/inet.h"
-#include "net_kern.h"
-#include "net_user.h"
 #include "mcast.h"
+#include "net_kern.h"
 
 struct mcast_init {
 	char *addr;
@@ -39,23 +35,20 @@ static void mcast_init(struct net_device *dev, void *data)
 	dpri->ttl = init->ttl;
 	dpri->dev = dev;
 
-	printk("mcast backend ");
+	printk("mcast backend multicast address: %s:%u, TTL:%u\n",
-	printk("multicast address: %s:%u, TTL:%u ",
 	       dpri->addr, dpri->port, dpri->ttl);
-
-	printk("\n");
 }
 
 static int mcast_read(int fd, struct sk_buff **skb, struct uml_net_private *lp)
 {
 	*skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
-	if(*skb == NULL) return(-ENOMEM);
+	if (*skb == NULL)
-	return(net_recvfrom(fd, skb_mac_header(*skb),
+		return -ENOMEM;
-			    (*skb)->dev->mtu + ETH_HEADER_OTHER));
+	return net_recvfrom(fd, skb_mac_header(*skb),
+			    (*skb)->dev->mtu + ETH_HEADER_OTHER);
 }
 
-static int mcast_write(int fd, struct sk_buff **skb,
+static int mcast_write(int fd, struct sk_buff **skb, struct uml_net_private *lp)
-			struct uml_net_private *lp)
 {
 	return mcast_user_write(fd, (*skb)->data, (*skb)->len,
 				(struct mcast_data *) &lp->user);
@@ -84,7 +77,7 @@ int mcast_setup(char *str, char **mac_out, void *data)
 	if (remain != NULL) {
 		printk(KERN_ERR "mcast_setup - Extra garbage on "
 		       "specification : '%s'\n", remain);
-		return(0);
+		return 0;
 	}
 
 	if (port_str != NULL) {
@@ -92,7 +85,7 @@ int mcast_setup(char *str, char **mac_out, void *data)
 		if ((*last != '\0') || (last == port_str)) {
 			printk(KERN_ERR "mcast_setup - Bad port : '%s'\n",
 			       port_str);
-			return(0);
+			return 0;
 		}
 	}
 
@@ -101,14 +94,14 @@ int mcast_setup(char *str, char **mac_out, void *data)
 		if ((*last != '\0') || (last == ttl_str)) {
 			printk(KERN_ERR "mcast_setup - Bad ttl : '%s'\n",
 			       ttl_str);
-			return(0);
+			return 0;
 		}
 	}
 
 	printk(KERN_INFO "Configured mcast device: %s:%u-%u\n", init->addr,
 	       init->port, init->ttl);
 
-	return(1);
+	return 1;
 }
 
 static struct transport mcast_transport = {

arch/um/drivers/mcast_user.c

@@ -1,5 +1,6 @@
 /*
  * 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
@@ -11,18 +12,13 @@
  *
  */
 
-#include <errno.h>
 #include <unistd.h>
-#include <sys/socket.h>
+#include <errno.h>
-#include <sys/un.h>
-#include <sys/time.h>
 #include <netinet/in.h>
-#include "net_user.h"
 #include "mcast.h"
-#include "kern_util.h"
+#include "net_user.h"
-#include "user.h"
-#include "os.h"
 #include "um_malloc.h"
+#include "user.h"
 
 #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
 
@@ -32,7 +28,8 @@ static struct sockaddr_in *new_addr(char *addr, unsigned short port)
 
 	sin = kmalloc(sizeof(struct sockaddr_in), UM_GFP_KERNEL);
 	if (sin == NULL) {
-		printk("new_addr: allocation of sockaddr_in failed\n");
+		printk(UM_KERN_ERR "new_addr: allocation of sockaddr_in "
+		       "failed\n");
 		return NULL;
 	}
 	sin->sin_family = AF_INET;
@@ -73,15 +70,15 @@ static int mcast_open(void *data)
 
 	if (fd < 0) {
 		err = -errno;
-		printk("mcast_open : data socket failed, errno = %d\n", 
+		printk(UM_KERN_ERR "mcast_open : data socket failed, "
-		       errno);
+		       "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",
+		printk(UM_KERN_ERR "mcast_open: SO_REUSEADDR failed, "
-			errno);
+		       "errno = %d\n", errno);
 		goto out_close;
 	}
 
@@ -89,23 +86,24 @@ 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",
+		printk(UM_KERN_ERR "mcast_open: IP_MULTICAST_TTL failed, "
-			errno);
+		       "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",
+		printk(UM_KERN_ERR "mcast_open: IP_MULTICAST_LOOP failed, "
-			errno);
+		       "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;
 	}
 
@@ -115,19 +113,19 @@ static int mcast_open(void *data)
 	if (setsockopt(fd, SOL_IP, IP_ADD_MEMBERSHIP,
 		       &mreq, sizeof(mreq)) < 0) {
 		err = -errno;
-		printk("mcast_open: IP_ADD_MEMBERSHIP failed, error = %d\n",
+		printk(UM_KERN_ERR "mcast_open: IP_ADD_MEMBERSHIP failed, "
-			errno);
+		       "error = %d\n", errno);
-		printk("There appears not to be a multicast-capable network "
+		printk(UM_KERN_ERR "There appears not to be a multicast-"
-		       "interface on the host.\n");
+		       "capable network interface on the host.\n");
-		printk("eth0 should be configured in order to use the "
+		printk(UM_KERN_ERR "eth0 should be configured in order to use "
-		       "multicast transport.\n");
+		       "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",
+		printk(UM_KERN_ERR "mcast_open: IP_DROP_MEMBERSHIP failed, "
-			errno);
+		       "error = %d\n", errno);
 	}
 
-	os_close_file(fd);
+	close(fd);
 }
 
 int mcast_user_write(int fd, void *buf, int len, struct mcast_data *pri)

arch/um/drivers/net_kern.c

@@ -1,33 +1,28 @@
 /*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * 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.
  * Licensed under the GPL.
  */
 
-#include "linux/kernel.h"
+#include <linux/bootmem.h>
-#include "linux/netdevice.h"
+#include <linux/etherdevice.h>
-#include "linux/rtnetlink.h"
+#include <linux/ethtool.h>
-#include "linux/skbuff.h"
+#include <linux/inetdevice.h>
-#include "linux/socket.h"
+#include <linux/init.h>
-#include "linux/spinlock.h"
+#include <linux/list.h>
-#include "linux/module.h"
+#include <linux/netdevice.h>
-#include "linux/init.h"
+#include <linux/platform_device.h>
-#include "linux/etherdevice.h"
+#include <linux/rtnetlink.h>
-#include "linux/list.h"
+#include <linux/skbuff.h>
-#include "linux/inetdevice.h"
+#include <linux/spinlock.h>
-#include "linux/ctype.h"
+#include "init.h"
-#include "linux/bootmem.h"
+#include "irq_kern.h"
-#include "linux/ethtool.h"
+#include "irq_user.h"
-#include "linux/platform_device.h"
+#include "mconsole_kern.h"
-#include "asm/uaccess.h"
-#include "kern_util.h"
 #include "net_kern.h"
 #include "net_user.h"
-#include "mconsole_kern.h"
-#include "init.h"
-#include "irq_user.h"
-#include "irq_kern.h"
 
 static inline void set_ether_mac(struct net_device *dev, unsigned char *addr)
 {
@@ -85,7 +80,7 @@ irqreturn_t uml_net_interrupt(int irq, void *dev_id)
 	int err;
 
 	if (!netif_running(dev))
-		return(IRQ_NONE);
+		return IRQ_NONE;
 
 	spin_lock(&lp->lock);
 	while ((err = uml_net_rx(dev)) > 0) ;
@@ -218,8 +213,10 @@ static struct net_device_stats *uml_net_get_stats(struct net_device *dev)
 
 static void uml_net_set_multicast_list(struct net_device *dev)
 {
-	if (dev->flags & IFF_PROMISC) return;
+	if (dev->flags & IFF_PROMISC)
-	else if (dev->mc_count)	dev->flags |= IFF_ALLMULTI;
+		return;
+	else if (dev->mc_count)
+		dev->flags |= IFF_ALLMULTI;
 	else dev->flags &= ~IFF_ALLMULTI;
 }
 
@@ -638,7 +635,7 @@ static int __init eth_setup(char *str)
 
 	new = alloc_bootmem(sizeof(*new));
 	if (new == NULL) {
-		printk("eth_init : alloc_bootmem failed\n");
+		printk(KERN_ERR "eth_init : alloc_bootmem failed\n");
 		return 1;
 	}
 
@@ -675,7 +672,7 @@ static int net_config(char *str, char **error_out)
 	err = !eth_setup_common(str, n);
 	if (err)
 		kfree(str);
-	return(err);
+	return err;
 }
 
 static int net_id(char **str, int *start_out, int *end_out)
@@ -820,7 +817,7 @@ struct sk_buff *ether_adjust_skb(struct sk_buff *skb, int extra)
 		skb = skb2;
 	}
 	if (skb != NULL) skb_put(skb, extra);
-	return(skb);
+	return skb;
 }
 
 void iter_addresses(void *d, void (*cb)(unsigned char *, unsigned char *,
@@ -850,14 +847,14 @@ int dev_netmask(void *d, void *m)
 	__be32 *mask_out = m;
 
 	if (ip == NULL)
-		return(1);
+		return 1;
 
 	in = ip->ifa_list;
 	if (in == NULL)
-		return(1);
+		return 1;
 
 	*mask_out = in->ifa_mask;
-	return(0);
+	return 0;
 }
 
 void *get_output_buffer(int *len_out)
@@ -882,15 +879,15 @@ int tap_setup_common(char *str, char *type, char **dev_name, char **mac_out,
 
 	remain = split_if_spec(str, dev_name, mac_out, gate_addr, NULL);
 	if (remain != NULL) {
-		printk("tap_setup_common - Extra garbage on specification : "
+		printk(KERN_ERR "tap_setup_common - Extra garbage on "
-		       "'%s'\n", remain);
+		       "specification : '%s'\n", remain);
-		return(1);
+		return 1;
 	}
 
-	return(0);
+	return 0;
 }
 
 unsigned short eth_protocol(struct sk_buff *skb)
 {
-	return(eth_type_trans(skb, skb->dev));
+	return eth_type_trans(skb, skb->dev);
 }

arch/um/drivers/net_user.c

@@ -1,24 +1,21 @@
 /*
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include <stddef.h>
-#include <stdarg.h>
-#include <unistd.h>
 #include <stdio.h>
+#include <unistd.h>
+#include <stdarg.h>
 #include <errno.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sys/time.h>
-#include "user.h"
-#include "kern_util.h"
 #include "net_user.h"
+#include "kern_constants.h"
 #include "os.h"
 #include "um_malloc.h"
-#include "kern_constants.h"
+#include "user.h"
 
 int tap_open_common(void *dev, char *gate_addr)
 {
@@ -28,7 +25,8 @@ int tap_open_common(void *dev, char *gate_addr)
 		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);
+		printk(UM_KERN_ERR "Invalid tap IP address - '%s'\n",
+		       gate_addr);
 		return -EINVAL;
 	}
 	return 0;
@@ -45,8 +43,8 @@ void tap_check_ips(char *gate_addr, unsigned char *eth_addr)
 	    (eth_addr[1] == tap_addr[1]) &&
 	    (eth_addr[2] == tap_addr[2]) &&
 	    (eth_addr[3] == tap_addr[3])) {
-		printk("The tap IP address and the UML eth IP address"
+		printk(UM_KERN_ERR "The tap IP address and the UML eth IP "
-		       " must be different\n");
+		       "address must be different\n");
 	}
 }
 
@@ -63,9 +61,11 @@ void read_output(int fd, char *output, int len)
 	}
 
 	*output = '\0';
-	ret = os_read_file(fd, &remain, sizeof(remain));
+	ret = read(fd, &remain, sizeof(remain));
 
 	if (ret != sizeof(remain)) {
+		if (ret < 0)
+			ret = -errno;
 		expected = sizeof(remain);
 		str = "length";
 		goto err;
@@ -73,8 +73,10 @@ void read_output(int fd, char *output, int len)
 
 	while (remain != 0) {
 		expected = (remain < len) ? remain : len;
-		ret = os_read_file(fd, output, expected);
+		ret = read(fd, output, expected);
 		if (ret != expected) {
+			if (ret < 0)
+				ret = -errno;
 			str = "data";
 			goto err;
 		}
@@ -85,18 +87,20 @@ void read_output(int fd, char *output, int len)
 
 err:
 	if (ret < 0)
-		printk("read_output - read of %s failed, errno = %d\n", str, -ret);
+		printk(UM_KERN_ERR "read_output - read of %s failed, "
+		       "errno = %d\n", str, -ret);
 	else
-		printk("read_output - read of %s failed, read only %d of %d bytes\n", str, ret, expected);
+		printk(UM_KERN_ERR "read_output - read of %s failed, read only "
+		       "%d of %d bytes\n", str, ret, expected);
 }
 
 int net_read(int fd, void *buf, int len)
 {
 	int n;
 
-	n = os_read_file(fd,  buf,  len);
+	n = read(fd,  buf,  len);
 
-	if(n == -EAGAIN)
+	if ((n < 0) && (errno == EAGAIN))
 		return 0;
 	else if (n == 0)
 		return -ENOTCONN;
@@ -122,9 +126,9 @@ int net_write(int fd, void *buf, int len)
 {
 	int n;
 
-	n = os_write_file(fd, buf, len);
+	n = write(fd, buf, len);
 
-	if(n == -EAGAIN)
+	if ((n < 0) && (errno == EAGAIN))
 		return 0;
 	else if (n == 0)
 		return -ENOTCONN;
@@ -171,7 +175,7 @@ static void change_pre_exec(void *arg)
 {
 	struct change_pre_exec_data *data = arg;
 
-	os_close_file(data->close_me);
+	close(data->close_me);
 	dup2(data->stdout, 1);
 }
 
@@ -182,7 +186,8 @@ 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);
+		printk(UM_KERN_ERR "change_tramp - pipe failed, err = %d\n",
+		       -err);
 		return err;
 	}
 	pe_data.close_me = fds[0];
@@ -192,8 +197,8 @@ static int change_tramp(char **argv, char *output, int output_len)
 	if (pid > 0)	/* Avoid hang as we won't get data in failure case. */
 		read_output(fds[0], output, output_len);
 
-	os_close_file(fds[0]);
+	close(fds[0]);
-	os_close_file(fds[1]);
+	close(fds[1]);
 
 	if (pid > 0)
 		CATCH_EINTR(err = waitpid(pid, NULL, 0));
@@ -219,7 +224,8 @@ static void change(char *dev, char *what, unsigned char *addr,
 	output_len = UM_KERN_PAGE_SIZE;
 	output = kmalloc(output_len, UM_GFP_KERNEL);
 	if (output == NULL)
-		printk("change : failed to allocate output buffer\n");
+		printk(UM_KERN_ERR "change : failed to allocate output "
+		       "buffer\n");
 
 	pid = change_tramp(argv, output, output_len);
 	if (pid < 0) return;

arch/um/drivers/pcap_kern.c

@@ -1,13 +1,11 @@
 /*
- * Copyright (C) 2002 Jeff Dike <jdike@karaya.com>
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL.
  */
 
 #include "linux/init.h"
-#include "linux/netdevice.h"
+#include <linux/netdevice.h>
-#include "linux/etherdevice.h"
 #include "net_kern.h"
-#include "net_user.h"
 #include "pcap_user.h"
 
 struct pcap_init {
@@ -92,7 +90,8 @@ int pcap_setup(char *str, char **mac_out, void *data)
 		else if (!strcmp(options[i], "nooptimize"))
 			init->optimize = 0;
 		else {
-			printk("pcap_setup : bad option - '%s'\n", options[i]);
+			printk(KERN_ERR "pcap_setup : bad option - '%s'\n",
+			       options[i]);
 			return 0;
 		}
 	}

arch/um/drivers/pcap_user.c

@@ -1,19 +1,17 @@
 /*
- * Copyright (C) 2002 Jeff Dike <jdike@karaya.com>
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL.
  */
 
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 #include <pcap.h>
+#include <string.h>
 #include <asm/types.h>
 #include "net_user.h"
 #include "pcap_user.h"
-#include "user.h"
-#include "um_malloc.h"
 #include "kern_constants.h"
+#include "um_malloc.h"
+#include "user.h"
 
 #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
 
@@ -53,7 +51,8 @@ static int pcap_open(void *data)
 			return -EIO;
 		}
 
-		pri->compiled = kmalloc(sizeof(struct bpf_program), UM_GFP_KERNEL);
+		pri->compiled = kmalloc(sizeof(struct bpf_program),
+					UM_GFP_KERNEL);
 		if (pri->compiled == NULL) {
 			printk(UM_KERN_ERR "pcap_open : kmalloc failed\n");
 			return -ENOMEM;
@@ -65,18 +64,22 @@ static int pcap_open(void *data)
 		if (err < 0) {
 			printk(UM_KERN_ERR "pcap_open : pcap_compile failed - "
 			       "'%s'\n", pcap_geterr(pri->pcap));
-			return -EIO;
+			goto out;
 		}
 
 		err = pcap_setfilter(pri->pcap, pri->compiled);
 		if (err < 0) {
 			printk(UM_KERN_ERR "pcap_open : pcap_setfilter "
 			       "failed - '%s'\n", pcap_geterr(pri->pcap));
-			return -EIO;
+			goto out;
 		}
 	}
 
 	return PCAP_FD(pri->pcap);
+
+ out:
+	kfree(pri->compiled);
+	return -EIO;
 }
 
 static void pcap_remove(void *data)

arch/um/drivers/slip_kern.c

@@ -1,11 +1,12 @@
-#include "linux/kernel.h"
+/*
-#include "linux/stddef.h"
+ * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
-#include "linux/init.h"
+ * Licensed under the GPL.
-#include "linux/netdevice.h"
+ */
-#include "linux/if_arp.h"
+
+#include <linux/if_arp.h>
+#include <linux/init.h>
+#include <linux/netdevice.h>
 #include "net_kern.h"
-#include "net_user.h"
-#include "kern.h"
 #include "slip.h"
 
 struct slip_init {
@@ -43,21 +44,21 @@ void slip_init(struct net_device *dev, void *data)
 
 static unsigned short slip_protocol(struct sk_buff *skbuff)
 {
-	return(htons(ETH_P_IP));
+	return htons(ETH_P_IP);
 }
 
 static int slip_read(int fd, struct sk_buff **skb,
 		       struct uml_net_private *lp)
 {
-	return(slip_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
+	return slip_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
-			      (struct slip_data *) &lp->user));
+			      (struct slip_data *) &lp->user);
 }
 
 static int slip_write(int fd, struct sk_buff **skb,
 		      struct uml_net_private *lp)
 {
-	return(slip_user_write(fd, (*skb)->data, (*skb)->len, 
+	return slip_user_write(fd, (*skb)->data, (*skb)->len,
-			       (struct slip_data *) &lp->user));
+			       (struct slip_data *) &lp->user);
 }
 
 const struct net_kern_info slip_kern_info = {
@@ -71,12 +72,11 @@ static int slip_setup(char *str, char **mac_out, void *data)
 {
 	struct slip_init *init = data;
 
-	*init = ((struct slip_init)
+	*init = ((struct slip_init) { .gate_addr = NULL });
-		{ .gate_addr 		= NULL });
 
 	if (str[0] != '\0')
 		init->gate_addr = str;
-	return(1);
+	return 1;
 }
 
 static struct transport slip_transport = {

arch/um/drivers/slip_user.c

@@ -1,21 +1,22 @@
+/*
+ * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <stddef.h>
-#include <sched.h>
-#include <string.h>
 #include <errno.h>
+#include <fcntl.h>
+#include <string.h>
 #include <sys/termios.h>
 #include <sys/wait.h>
-#include <sys/signal.h>
-#include "kern_util.h"
-#include "user.h"
-#include "net_user.h"
-#include "slip.h"
-#include "slip_common.h"
-#include "os.h"
-#include "um_malloc.h"
 #include "kern_constants.h"
+#include "net_user.h"
+#include "os.h"
+#include "slip.h"
+#include "um_malloc.h"
+#include "user.h"
 
 static int slip_user_init(void *data, void *dev)
 {
@@ -31,8 +32,9 @@ static int set_up_tty(int fd)
 	struct termios tios;
 
 	if (tcgetattr(fd, &tios) < 0) {
-		printk("could not get initial terminal attributes\n");
+		printk(UM_KERN_ERR "could not get initial terminal "
-		return(-1);
+		       "attributes\n");
+		return -1;
 	}
 
 	tios.c_cflag = CS8 | CREAD | HUPCL | CLOCAL;
@@ -48,10 +50,10 @@ static int set_up_tty(int fd)
 	cfsetispeed(&tios, B38400);
 
 	if (tcsetattr(fd, TCSAFLUSH, &tios) < 0) {
-		printk("failed to set terminal attributes\n");
+		printk(UM_KERN_ERR "failed to set terminal attributes\n");
-		return(-1);
+		return -1;
 	}
-	return(0);
+	return 0;
 }
 
 struct slip_pre_exec_data {
@@ -64,9 +66,11 @@ static void slip_pre_exec(void *arg)
 {
 	struct slip_pre_exec_data *data = arg;
 
-	if(data->stdin >= 0) dup2(data->stdin, 0);
+	if (data->stdin >= 0)
+		dup2(data->stdin, 0);
 	dup2(data->stdout, 1);
-	if(data->close_me >= 0) os_close_file(data->close_me);
+	if (data->close_me >= 0)
+		close(data->close_me);
 }
 
 static int slip_tramp(char **argv, int fd)
@@ -77,7 +81,8 @@ static int slip_tramp(char **argv, int fd)
 
 	err = os_pipe(fds, 1, 0);
 	if (err < 0) {
-		printk("slip_tramp : pipe failed, err = %d\n", -err);
+		printk(UM_KERN_ERR "slip_tramp : pipe failed, err = %d\n",
+		       -err);
 		goto out;
 	}
 
@@ -93,13 +98,14 @@ static int slip_tramp(char **argv, int fd)
 	output_len = UM_KERN_PAGE_SIZE;
 	output = kmalloc(output_len, UM_GFP_KERNEL);
 	if (output == NULL) {
-		printk("slip_tramp : failed to allocate output buffer\n");
+		printk(UM_KERN_ERR "slip_tramp : failed to allocate output "
+		       "buffer\n");
 		os_kill_process(pid, 1);
 		err = -ENOMEM;
 		goto out_free;
 	}
 
-	os_close_file(fds[1]);
+	close(fds[1]);
 	read_output(fds[0], output, output_len);
 	printk("%s", output);
 
@@ -107,20 +113,20 @@ static int slip_tramp(char **argv, int fd)
 	if (err < 0)
 		err = errno;
 	else if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
-		printk("'%s' didn't exit with status 0\n", argv[0]);
+		printk(UM_KERN_ERR "'%s' didn't exit with status 0\n", argv[0]);
 		err = -EINVAL;
 	}
 	else err = 0;
 
-	os_close_file(fds[0]);
+	close(fds[0]);
 
 out_free:
 	kfree(output);
 	return err;
 
 out_close:
-	os_close_file(fds[0]);
+	close(fds[0]);
-	os_close_file(fds[1]);
+	close(fds[1]);
 out:
 	return err;
 }
@@ -136,14 +142,16 @@ static int slip_open(void *data)
 
 	err = get_pty();
 	if (err < 0) {
-		printk("slip-open : Failed to open pty, err = %d\n", -err);
+		printk(UM_KERN_ERR "slip-open : Failed to open pty, err = %d\n",
+		       -err);
 		goto out;
 	}
 	mfd = err;
 
-	err = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
+	err = open(ptsname(mfd), O_RDWR, 0);
 	if (err < 0) {
-		printk("Couldn't open tty for slip line, err = %d\n", -err);
+		printk(UM_KERN_ERR "Couldn't open tty for slip line, "
+		       "err = %d\n", -err);
 		goto out_close;
 	}
 	sfd = err;
@@ -161,12 +169,14 @@ static int slip_open(void *data)
 		err = slip_tramp(argv, sfd);
 
 		if (err < 0) {
-			printk("slip_tramp failed - err = %d\n", -err);
+			printk(UM_KERN_ERR "slip_tramp failed - err = %d\n",
+			       -err);
 			goto out_close2;
 		}
 		err = os_get_ifname(pri->slave, pri->name);
 		if (err < 0) {
-			printk("get_ifname failed, err = %d\n", -err);
+			printk(UM_KERN_ERR "get_ifname failed, err = %d\n",
+			       -err);
 			goto out_close2;
 		}
 		iter_addresses(pri->dev, open_addr, pri->name);
@@ -174,16 +184,16 @@ static int slip_open(void *data)
 	else {
 		err = os_set_slip(sfd);
 		if (err < 0) {
-			printk("Failed to set slip discipline encapsulation - "
+			printk(UM_KERN_ERR "Failed to set slip discipline "
-			       "err = %d\n", -err);
+			       "encapsulation - err = %d\n", -err);
 			goto out_close2;
 		}
 	}
-	return(mfd);
+	return mfd;
 out_close2:
-	os_close_file(sfd);
+	close(sfd);
 out_close:
-	os_close_file(mfd);
+	close(mfd);
 out:
 	return err;
 }
@@ -204,9 +214,9 @@ static void slip_close(int fd, void *data)
 	err = slip_tramp(argv, pri->slave);
 
 	if (err != 0)
-		printk("slip_tramp failed - errno = %d\n", -err);
+		printk(UM_KERN_ERR "slip_tramp failed - errno = %d\n", -err);
-	os_close_file(fd);
+	close(fd);
-	os_close_file(pri->slave);
+	close(pri->slave);
 	pri->slave = -1;
 }
 
@@ -222,7 +232,7 @@ int slip_user_write(int fd, void *buf, int len, struct slip_data *pri)
 
 static int slip_set_mtu(int mtu, void *data)
 {
-	return(mtu);
+	return mtu;
 }
 
 static void slip_add_addr(unsigned char *addr, unsigned char *netmask,
@@ -230,7 +240,8 @@ static void slip_add_addr(unsigned char *addr, unsigned char *netmask,
 {
 	struct slip_data *pri = data;
 
-	if(pri->slave < 0) return;
+	if (pri->slave < 0)
+		return;
 	open_addr(addr, netmask, pri->name);
 }
 
@@ -239,7 +250,8 @@ static void slip_del_addr(unsigned char *addr, unsigned char *netmask,
 {
 	struct slip_data *pri = data;
 
-	if(pri->slave < 0) return;
+	if (pri->slave < 0)
+		return;
 	close_addr(addr, netmask, pri->name);
 }
 

arch/um/drivers/slirp_kern.c

@@ -1,11 +1,14 @@
-#include "linux/kernel.h"
+/*
-#include "linux/stddef.h"
+ * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL.
+ */
+
+#include <linux/if_arp.h>
 #include "linux/init.h"
-#include "linux/netdevice.h"
+#include <linux/netdevice.h>
-#include "linux/if_arp.h"
+#include <linux/string.h>
 #include "net_kern.h"
 #include "net_user.h"
-#include "kern.h"
 #include "slirp.h"
 
 struct slirp_init {
@@ -39,29 +42,28 @@ void slirp_init(struct net_device *dev, void *data)
 	dev->tx_queue_len = 256;
 	dev->flags = IFF_NOARP;
 	printk("SLIRP backend - command line:");
-	for(i=0;spri->argw.argv[i]!=NULL;i++) {
+	for (i = 0; spri->argw.argv[i] != NULL; i++)
 		printk(" '%s'",spri->argw.argv[i]);
-	}
 	printk("\n");
 }
 
 static unsigned short slirp_protocol(struct sk_buff *skbuff)
 {
-	return(htons(ETH_P_IP));
+	return htons(ETH_P_IP);
 }
 
 static int slirp_read(int fd, struct sk_buff **skb,
 		       struct uml_net_private *lp)
 {
-	return(slirp_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
+	return slirp_user_read(fd, skb_mac_header(*skb), (*skb)->dev->mtu,
-			      (struct slirp_data *) &lp->user));
+			      (struct slirp_data *) &lp->user);
 }
 
 static int slirp_write(int fd, struct sk_buff **skb,
 		      struct uml_net_private *lp)
 {
-	return(slirp_user_write(fd, (*skb)->data, (*skb)->len, 
+	return slirp_user_write(fd, (*skb)->data, (*skb)->len,
-			       (struct slirp_data *) &lp->user));
+			       (struct slirp_data *) &lp->user);
 }
 
 const struct net_kern_info slirp_kern_info = {
@@ -76,31 +78,32 @@ static int slirp_setup(char *str, char **mac_out, void *data)
 	struct slirp_init *init = data;
 	int i=0;
 
-	*init = ((struct slirp_init)
+	*init = ((struct slirp_init) { .argw = { { "slirp", NULL  } } });
-		{ .argw = { { "slirp", NULL  } } });
 
 	str = split_if_spec(str, mac_out, NULL);
 
-	if(str == NULL) { /* no command line given after MAC addr */
+	if (str == NULL) /* no command line given after MAC addr */
-		return(1);
+		return 1;
-	}
 
 	do {
 		if (i >= SLIRP_MAX_ARGS - 1) {
-			printk("slirp_setup: truncating slirp arguments\n");
+			printk(KERN_WARNING "slirp_setup: truncating slirp "
+			       "arguments\n");
 			break;
 		}
 		init->argw.argv[i++] = str;
 		while(*str && *str!=',') {
-			if(*str=='_') *str=' ';
+			if (*str == '_')
+				*str=' ';
 			str++;
 		}
 		if (*str != ',')
 			break;
 		*str++ = '\0';
 	} while (1);
+
 	init->argw.argv[i] = NULL;
-	return(1);
+	return 1;
 }
 
 static struct transport slirp_transport = {

arch/um/drivers/slirp_user.c

@@ -1,18 +1,17 @@
-#include <stdio.h>
+/*
-#include <stdlib.h>
+ * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL.
+ */
+
 #include <unistd.h>
-#include <stddef.h>
-#include <sched.h>
-#include <string.h>
 #include <errno.h>
+#include <string.h>
 #include <sys/wait.h>
-#include <sys/signal.h>
+#include "kern_constants.h"
-#include "kern_util.h"
-#include "user.h"
 #include "net_user.h"
-#include "slirp.h"
-#include "slip_common.h"
 #include "os.h"
+#include "slirp.h"
+#include "user.h"
 
 static int slirp_user_init(void *data, void *dev)
 {
@@ -31,8 +30,10 @@ static void slirp_pre_exec(void *arg)
 {
 	struct slirp_pre_exec_data *data = arg;
 
-	if(data->stdin != -1) dup2(data->stdin, 0);
+	if (data->stdin != -1)
-	if(data->stdout != -1) dup2(data->stdout, 1);
+		dup2(data->stdin, 0);
+	if (data->stdout != -1)
+		dup2(data->stdout, 1);
 }
 
 static int slirp_tramp(char **argv, int fd)
@@ -44,7 +45,7 @@ static int slirp_tramp(char **argv, int fd)
 	pe_data.stdout = fd;
 	pid = run_helper(slirp_pre_exec, &pe_data, argv);
 
-	return(pid);
+	return pid;
 }
 
 static int slirp_open(void *data)
@@ -54,11 +55,11 @@ static int slirp_open(void *data)
 
 	err = os_pipe(fds, 1, 1);
 	if (err)
-		return(err);
+		return err;
 
 	err = slirp_tramp(pri->argw.argv, fds[1]);
 	if (err < 0) {
-		printk("slirp_tramp failed - errno = %d\n", -err);
+		printk(UM_KERN_ERR "slirp_tramp failed - errno = %d\n", -err);
 		goto out;
 	}
 	pid = err;
@@ -68,10 +69,10 @@ static int slirp_open(void *data)
 	pri->slip.esc = 0;
 	pri->pid = err;
 
-	return(fds[0]);
+	return fds[0];
 out:
-	os_close_file(fds[0]);
+	close(fds[0]);
-	os_close_file(fds[1]);
+	close(fds[1]);
 	return err;
 }
 
@@ -80,31 +81,33 @@ static void slirp_close(int fd, void *data)
 	struct slirp_data *pri = data;
 	int status,err;
 
-	os_close_file(fd);
+	close(fd);
-	os_close_file(pri->slave);
+	close(pri->slave);
 
 	pri->slave = -1;
 
 	if (pri->pid<1) {
-		printk("slirp_close: no child process to shut down\n");
+		printk(UM_KERN_ERR "slirp_close: no child process to shut "
+		       "down\n");
 		return;
 	}
 
 #if 0
 	if (kill(pri->pid, SIGHUP)<0) {
-		printk("slirp_close: sending hangup to %d failed (%d)\n",
+		printk(UM_KERN_ERR "slirp_close: sending hangup to %d failed "
-			pri->pid, errno);
+		       "(%d)\n", pri->pid, errno);
 	}
 #endif
 
 	CATCH_EINTR(err = waitpid(pri->pid, &status, WNOHANG));
 	if (err < 0) {
-		printk("slirp_close: waitpid returned %d\n", errno);
+		printk(UM_KERN_ERR "slirp_close: waitpid returned %d\n", errno);
 		return;
 	}
 
 	if (err == 0) {
-		printk("slirp_close: process %d has not exited\n", pri->pid);
+		printk(UM_KERN_ERR "slirp_close: process %d has not exited\n",
+		       pri->pid);
 		return;
 	}
 
@@ -123,7 +126,7 @@ int slirp_user_write(int fd, void *buf, int len, struct slirp_data *pri)
 
 static int slirp_set_mtu(int mtu, void *data)
 {
-	return(mtu);
+	return mtu;
 }
 
 const struct net_user_info slirp_user_info = {

arch/um/drivers/vde_kern.c

@@ -7,10 +7,8 @@
  *
  */
 
-#include "linux/kernel.h"
 #include "linux/init.h"
-#include "linux/netdevice.h"
+#include <linux/netdevice.h>
-#include "linux/etherdevice.h"
 #include "net_kern.h"
 #include "net_user.h"
 #include "vde.h"
@@ -30,12 +28,12 @@ static void vde_init(struct net_device *dev, void *data)
 	vpri->conn = NULL;
 	vpri->dev = dev;
 
-	printk(KERN_INFO "vde backend - %s, ", vpri->vde_switch ?
+	printk("vde backend - %s, ", vpri->vde_switch ?
 	       vpri->vde_switch : "(default socket)");
 
 	vde_init_libstuff(vpri, init);
 
-	printk(KERN_INFO "\n");
+	printk("\n");
 }
 
 static int vde_read(int fd, struct sk_buff **skb, struct uml_net_private *lp)

arch/um/drivers/vde_user.c

@@ -3,15 +3,13 @@
  * Licensed under the GPL.
  */
 
+#include <stddef.h>
 #include <errno.h>
-#include <unistd.h>
 #include <libvdeplug.h>
-#include "net_user.h"
-#include "kern_util.h"
 #include "kern_constants.h"
-#include "user.h"
+#include "net_user.h"
-#include "os.h"
 #include "um_malloc.h"
+#include "user.h"
 #include "vde.h"
 
 #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)

arch/um/os-Linux/drivers/etap.h

@@ -1,8 +1,11 @@
 /* 
- * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
+#ifndef __DRIVERS_ETAP_H
+#define __DRIVERS_ETAP_H
+
 #include "net_user.h"
 
 struct ethertap_data {
@@ -15,13 +18,4 @@ struct ethertap_data {
 
 extern const struct net_user_info ethertap_user_info;
 
-/*
+#endif
- * 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:
- */

arch/um/os-Linux/drivers/ethertap_kern.c

@@ -1,16 +1,15 @@
 /*
  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org) and
  * James Leu (jleu@mindspring.net).
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Copyright (C) 2001 by various other people who didn't put their name here.
  * Licensed under the GPL.
  */
 
 #include "linux/init.h"
-#include "linux/netdevice.h"
+#include <linux/netdevice.h>
-#include "linux/etherdevice.h"
-#include "net_kern.h"
-#include "net_user.h"
 #include "etap.h"
+#include "net_kern.h"
 
 struct ethertap_init {
 	char *dev_name;
@@ -42,13 +41,15 @@ static int etap_read(int fd, struct sk_buff **skb, struct uml_net_private *lp)
 	int len;
 
 	*skb = ether_adjust_skb(*skb, ETH_HEADER_ETHERTAP);
-	if(*skb == NULL) return(-ENOMEM);
+	if (*skb == NULL)
+		return -ENOMEM;
 	len = net_recvfrom(fd, skb_mac_header(*skb),
 			   (*skb)->dev->mtu + 2 * ETH_HEADER_ETHERTAP);
-	if(len <= 0) return(len);
+	if (len <= 0)
+		return len;
 	skb_pull(*skb, 2);
 	len -= 2;
-	return(len);
+	return len;
 }
 
 static int etap_write(int fd, struct sk_buff **skb, struct uml_net_private *lp)
@@ -58,11 +59,12 @@ static int etap_write(int fd, struct sk_buff **skb, struct uml_net_private *lp)
 
 		skb2 = skb_realloc_headroom(*skb, 2);
 		dev_kfree_skb(*skb);
-		if (skb2 == NULL) return(-ENOMEM);
+		if (skb2 == NULL)
+			return -ENOMEM;
 		*skb = skb2;
 	}
 	skb_push(*skb, 2);
-	return(net_send(fd, (*skb)->data, (*skb)->len));
+	return net_send(fd, (*skb)->data, (*skb)->len);
 }
 
 const struct net_kern_info ethertap_kern_info = {
@@ -81,13 +83,13 @@ int ethertap_setup(char *str, char **mac_out, void *data)
 		  .gate_addr 	= NULL });
 	if (tap_setup_common(str, "ethertap", &init->dev_name, mac_out,
 			    &init->gate_addr))
-		return(0);
+		return 0;
 	if (init->dev_name == NULL) {
-		printk("ethertap_setup : Missing tap device name\n");
+		printk(KERN_ERR "ethertap_setup : Missing tap device name\n");
-		return(0);
+		return 0;
 	}
 
-	return(1);
+	return 1;
 }
 
 static struct transport ethertap_transport = {

arch/um/os-Linux/drivers/ethertap_user.c

@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * 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.
@@ -7,20 +8,16 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <stddef.h>
+#include <errno.h>
-#include <stdlib.h>
+#include <string.h>
-#include <sys/errno.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
-#include <sys/un.h>
-#include <net/if.h>
-#include "user.h"
-#include "kern_util.h"
-#include "net_user.h"
 #include "etap.h"
-#include "os.h"
-#include "um_malloc.h"
 #include "kern_constants.h"
+#include "os.h"
+#include "net_user.h"
+#include "um_malloc.h"
+#include "user.h"
 
 #define MAX_PACKET ETH_MAX_PACKET
 
@@ -50,13 +47,15 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
 	memcpy(change.netmask, netmask, sizeof(change.netmask));
 	CATCH_EINTR(n = write(fd, &change, sizeof(change)));
 	if (n != sizeof(change)) {
-		printk("etap_change - request failed, err = %d\n", errno);
+		printk(UM_KERN_ERR "etap_change - request failed, err = %d\n",
+		       errno);
 		return;
 	}
 
 	output = kmalloc(UM_KERN_PAGE_SIZE, UM_GFP_KERNEL);
 	if (output == NULL)
-		printk("etap_change : Failed to allocate output buffer\n");
+		printk(UM_KERN_ERR "etap_change : Failed to allocate output "
+		       "buffer\n");
 	read_output(fd, output, UM_KERN_PAGE_SIZE);
 	if (output != NULL) {
 		printk("%s", output);
@@ -126,17 +125,19 @@ static int etap_tramp(char *dev, char *gate, int control_me,
 	CATCH_EINTR(n = read(control_me, &c, sizeof(c)));
 	if (n != sizeof(c)) {
 		err = -errno;
-		printk("etap_tramp : read of status failed, err = %d\n", -err);
+		printk(UM_KERN_ERR "etap_tramp : read of status failed, "
+		       "err = %d\n", -err);
 		return err;
 	}
 	if (c != 1) {
-		printk("etap_tramp : uml_net failed\n");
+		printk(UM_KERN_ERR "etap_tramp : uml_net failed\n");
 		err = -EINVAL;
 		CATCH_EINTR(n = waitpid(pid, &status, 0));
 		if (n < 0)
 			err = -errno;
 		else if (!WIFEXITED(status) || (WEXITSTATUS(status) != 1))
-			printk("uml_net didn't exit with status 1\n");
+			printk(UM_KERN_ERR "uml_net didn't exit with "
+			       "status 1\n");
 	}
 	return err;
 }
@@ -154,16 +155,16 @@ static int etap_open(void *data)
 	err = socketpair(AF_UNIX, SOCK_DGRAM, 0, data_fds);
 	if (err) {
 		err = -errno;
-		printk("etap_open - data socketpair failed - err = %d\n",
+		printk(UM_KERN_ERR "etap_open - data socketpair failed - "
-		       errno);
+		       "err = %d\n", errno);
 		return err;
 	}
 
 	err = socketpair(AF_UNIX, SOCK_STREAM, 0, control_fds);
 	if (err) {
 		err = -errno;
-		printk("etap_open - control socketpair failed - err = %d\n",
+		printk(UM_KERN_ERR "etap_open - control socketpair failed - "
-		       errno);
+		       "err = %d\n", errno);
 		goto out_close_data;
 	}
 
@@ -174,14 +175,15 @@ static int etap_open(void *data)
 	read_output(control_fds[0], output, output_len);
 
 	if (output == NULL)
-		printk("etap_open : failed to allocate output buffer\n");
+		printk(UM_KERN_ERR "etap_open : failed to allocate output "
+		       "buffer\n");
 	else {
 		printk("%s", output);
 		kfree(output);
 	}
 
 	if (err < 0) {
-		printk("etap_tramp failed - err = %d\n", -err);
+		printk(UM_KERN_ERR "etap_tramp failed - err = %d\n", -err);
 		goto out_close_control;
 	}
 
@@ -207,12 +209,12 @@ static void etap_close(int fd, void *data)
 	close(fd);
 
 	if (shutdown(pri->data_fd, SHUT_RDWR) < 0)
-		printk("etap_close - shutdown data socket failed, errno = %d\n",
+		printk(UM_KERN_ERR "etap_close - shutdown data socket failed, "
-		       errno);
+		       "errno = %d\n", errno);
 
 	if (shutdown(pri->control_fd, SHUT_RDWR) < 0)
-		printk("etap_close - shutdown control socket failed, "
+		printk(UM_KERN_ERR "etap_close - shutdown control socket "
-		       "errno = %d\n", errno);
+		       "failed, errno = %d\n", errno);
 
 	close(pri->data_fd);
 	pri->data_fd = -1;

arch/um/os-Linux/drivers/tuntap.h

@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
@@ -19,14 +19,3 @@ struct tuntap_data {
 extern const struct net_user_info tuntap_user_info;
 
 #endif
-
-/*
- * 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:
- */

arch/um/os-Linux/drivers/tuntap_kern.c

@@ -1,16 +1,13 @@
 /*
- * Copyright (C) 2001 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "linux/stddef.h"
+#include <linux/netdevice.h>
-#include "linux/netdevice.h"
+#include <linux/init.h>
-#include "linux/etherdevice.h"
+#include <linux/skbuff.h>
-#include "linux/skbuff.h"
+#include <asm/errno.h>
-#include "linux/init.h"
-#include "asm/errno.h"
 #include "net_kern.h"
-#include "net_user.h"
 #include "tuntap.h"
 
 struct tuntap_init {
@@ -42,15 +39,16 @@ static int tuntap_read(int fd, struct sk_buff **skb,
 		       struct uml_net_private *lp)
 {
 	*skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
-	if(*skb == NULL) return(-ENOMEM);
+	if (*skb == NULL)
-	return(net_read(fd, skb_mac_header(*skb),
+		return -ENOMEM;
-			(*skb)->dev->mtu + ETH_HEADER_OTHER));
+	return net_read(fd, skb_mac_header(*skb),
+			(*skb)->dev->mtu + ETH_HEADER_OTHER);
 }
 
 static int tuntap_write(int fd, struct sk_buff **skb,
 			struct uml_net_private *lp)
 {
-	return(net_write(fd, (*skb)->data, (*skb)->len));
+	return net_write(fd, (*skb)->data, (*skb)->len);
 }
 
 const struct net_kern_info tuntap_kern_info = {
@@ -69,9 +67,9 @@ int tuntap_setup(char *str, char **mac_out, void *data)
 		  .gate_addr 	= NULL });
 	if (tap_setup_common(str, "tuntap", &init->dev_name, mac_out,
 			    &init->gate_addr))
-		return(0);
+		return 0;
 
-	return(1);
+	return 1;
 }
 
 static struct transport tuntap_transport = {

arch/um/os-Linux/drivers/tuntap_user.c

@@ -1,25 +1,22 @@
 /* 
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
 #include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <sys/wait.h>
+#include <string.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/uio.h>
-#include <sys/ioctl.h>
-#include <net/if.h>
 #include <linux/if_tun.h>
-#include "net_user.h"
+#include <net/if.h>
-#include "tuntap.h"
+#include <sys/ioctl.h>
-#include "kern_util.h"
+#include <sys/socket.h>
-#include "user.h"
+#include <sys/wait.h>
+#include <sys/uio.h>
+#include "kern_constants.h"
 #include "os.h"
+#include "tuntap.h"
+#include "user.h"
 
 #define MAX_PACKET ETH_MAX_PACKET
 
@@ -108,20 +105,22 @@ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
 	*used_out = n;
 	if (n < 0) {
 		err = -errno;
-		printk("tuntap_open_tramp : recvmsg failed - errno = %d\n", 
+		printk(UM_KERN_ERR "tuntap_open_tramp : recvmsg failed - "
-		       errno);
+		       "errno = %d\n", errno);
 		return err;
 	}
 	CATCH_EINTR(waitpid(pid, NULL, 0));
 
 	cmsg = CMSG_FIRSTHDR(&msg);
 	if (cmsg == NULL) {
-		printk("tuntap_open_tramp : didn't receive a message\n");
+		printk(UM_KERN_ERR "tuntap_open_tramp : didn't receive a "
+		       "message\n");
 		return -EINVAL;
 	}
 	if ((cmsg->cmsg_level != SOL_SOCKET) ||
 	   (cmsg->cmsg_type != SCM_RIGHTS)) {
-		printk("tuntap_open_tramp : didn't receive a descriptor\n");
+		printk(UM_KERN_ERR "tuntap_open_tramp : didn't receive a "
+		       "descriptor\n");
 		return -EINVAL;
 	}
 	*fd_out = ((int *) CMSG_DATA(cmsg))[0];
@@ -144,8 +143,8 @@ static int tuntap_open(void *data)
 		pri->fd = os_open_file("/dev/net/tun",
 				       of_cloexec(of_rdwr(OPENFLAGS())), 0);
 		if (pri->fd < 0) {
-			printk("Failed to open /dev/net/tun, err = %d\n",
+			printk(UM_KERN_ERR "Failed to open /dev/net/tun, "
-			       -pri->fd);
+			       "err = %d\n", -pri->fd);
 			return pri->fd;
 		}
 		memset(&ifr, 0, sizeof(ifr));
@@ -153,7 +152,8 @@ static int tuntap_open(void *data)
 		strlcpy(ifr.ifr_name, pri->dev_name, sizeof(ifr.ifr_name));
 		if (ioctl(pri->fd, TUNSETIFF, (void *) &ifr) < 0) {
 			err = -errno;
-			printk("TUNSETIFF failed, errno = %d\n", errno);
+			printk(UM_KERN_ERR "TUNSETIFF failed, errno = %d\n",
+			       errno);
 			close(pri->fd);
 			return err;
 		}
@@ -162,8 +162,8 @@ static int tuntap_open(void *data)
 		err = socketpair(AF_UNIX, SOCK_DGRAM, 0, fds);
 		if (err) {
 			err = -errno;
-			printk("tuntap_open : socketpair failed - errno = %d\n",
+			printk(UM_KERN_ERR "tuntap_open : socketpair failed - "
-			       errno);
+			       "errno = %d\n", errno);
 			return err;
 		}
 
@@ -179,7 +179,8 @@ static int tuntap_open(void *data)
 		if (err < 0) {
 			printk("%s", output);
 			free_output_buffer(buffer);
-			printk("tuntap_open_tramp failed - err = %d\n", -err);
+			printk(UM_KERN_ERR "tuntap_open_tramp failed - "
+			       "err = %d\n", -err);
 			return err;
 		}