Re: [uml-devel] [RFC PATCH] vde network backend

[Luca Bigliardi <shammash@artha.org>]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

On Wed, Aug 15, 2007 at 11:20 AM, Jeff Dike wrote:

> What did you change?  BB was right to comment on my changelog, but I
> don't see any examples of if( blah ) { anywhere in the vde code.

I've changed "if(blah)" into "if (blah)".

> Since the main patch is in -mm, if you have changes, send incremental
> patches, not updated full patches.

I'm sorry. I'm attaching the diff between the -mm patch and the newer one.


luca

-- 
Beware of programmers who carry screwdrivers.
                        -- Leonard Brandwein

http://shammash.homelinux.org/ - http://www.artha.org/ - http://www.yue.it/

[-- Attachment #2: uml_vdetransport-02_01.patch --]
[-- Type: text/x-diff, Size: 3047 bytes --]

--- uml_vdetransport-02.patch	2007-07-26 18:49:55.000000000 +0200
+++ uml_vdetransport-03.patch	2007-08-12 14:02:15.000000000 +0200
@@ -142,9 +142,9 @@
 +{
 +	struct vde_data *pri = (struct vde_data *) &lp->user;
 +
-+	if(pri->conn != NULL) {
++	if (pri->conn != NULL) {
 +		*skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
-+		if(*skb == NULL)
++		if (*skb == NULL)
 +			return -ENOMEM;
 +
 +		return vde_user_read(pri->conn, skb_mac_header(*skb),
@@ -159,7 +159,7 @@
 +{
 +	struct vde_data *pri = (struct vde_data *) &lp->user;
 +
-+	if(pri->conn != NULL)
++	if (pri->conn != NULL)
 +		return vde_user_write((void *)pri->conn, (*skb)->data,
 +					(*skb)->len);
 +
@@ -189,22 +189,22 @@
 +	remain = split_if_spec(str, &init->vde_switch, mac_out, &port_str,
 +				&init->group, &mode_str, &init->descr, NULL);
 +
-+	if(remain != NULL)
++	if (remain != NULL)
 +		printk(KERN_WARNING "vde_setup - Ignoring extra data :"
 +					"'%s'\n", remain);
 +
-+	if(port_str != NULL) {
++	if (port_str != NULL) {
 +		init->port = simple_strtoul(port_str, &last, 10);
-+		if((*last != '\0') || (last == port_str)) {
++		if ((*last != '\0') || (last == port_str)) {
 +			printk(KERN_ERR "vde_setup - Bad port : '%s'\n",
 +						port_str);
 +			return 0;
 +		}
 +	}
 +	
-+	if(mode_str != NULL) {
++	if (mode_str != NULL) {
 +		init->mode = simple_strtoul(mode_str, &last, 8);
-+		if((*last != '\0') || (last == mode_str)) {
++		if ((*last != '\0') || (last == mode_str)) {
 +			printk(KERN_ERR "vde_setup - Bad mode : '%s'\n",
 +						mode_str);
 +			return 0;
@@ -265,7 +265,7 @@
 +
 +	conn = vde_open(pri->vde_switch, pri->descr, pri->args);
 +	
-+	if(conn == NULL) {
++	if (conn == NULL) {
 +		err = -errno;
 +		printk(UM_KERN_ERR "vde_user_init: vde_open failed, "
 +					"errno = %d\n", errno);
@@ -283,7 +283,7 @@
 +{
 +	struct vde_data *pri = data;
 +
-+	if(pri->conn != NULL)
++	if (pri->conn != NULL)
 +		return vde_datafd(pri->conn);
 +	
 +	printk(UM_KERN_WARNING "vde_open - we have no VDECONN to open");
@@ -294,7 +294,7 @@
 +{
 +	struct vde_data *pri = data;
 +
-+	if(pri->conn != NULL) {
++	if (pri->conn != NULL) {
 +		printk(UM_KERN_INFO "vde backend - closing connection\n");
 +		vde_close(pri->conn);
 +		pri->conn = NULL;
@@ -327,7 +327,7 @@
 +	struct vde_open_args *args;
 +
 +	vpri->args = kmalloc(sizeof(struct vde_open_args), UM_GFP_KERNEL);
-+	if(vpri->args == NULL) {
++	if (vpri->args == NULL) {
 +		printk(UM_KERN_ERR "\nvde_init_libstuff - vde_open_args"
 +					"allocation failed");
 +		return;
@@ -348,16 +348,16 @@
 +	VDECONN *vconn = (VDECONN *) conn;
 +	int rv;
 +
-+	if(vconn == NULL)
++	if (vconn == NULL)
 +		return 0;
 +
 +	rv = vde_recv(vconn, buf, len, 0);
-+	if(rv < 0) {
-+		if(errno == EAGAIN)
++	if (rv < 0) {
++		if (errno == EAGAIN)
 +			return 0;
 +		return -errno;
 +	}
-+	else if(rv == 0)
++	else if (rv == 0)
 +		return -ENOTCONN;
 +
 +	return rv;
@@ -367,7 +367,7 @@
 +{
 +	VDECONN *vconn = (VDECONN *) conn;
 +
-+	if(vconn == NULL)
++	if (vconn == NULL)
 +		return 0;
 +
 +	return vde_send(vconn, buf, len, 0);

[-- Attachment #3: Type: text/plain, Size: 315 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

[-- Attachment #4: Type: text/plain, Size: 194 bytes --]

_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel