[patch 0/2] veth: veth pair device code cleanup

[patch 0/2] veth: veth pair device code cleanup

[Daniel Lezcano]

The next two patches remove some unused code in the veth pair network device.

-- 

[patch 1/2] veth: Remove useless veth field

[Daniel Lezcano]

[-- Attachment #1: remove-useless-veth-field.patch --]
[-- Type: text/plain, Size: 1013 bytes --]

The veth private structure contains a netdev pointer refering to its peer.
This field is never used and it is pointless because if we can access,
the veth_priv, that means we already have the netdev which is stored
in veth_priv->dev.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
 drivers/net/veth.c |    3 ---
 1 file changed, 3 deletions(-)

Index: net-2.6/drivers/net/veth.c
===================================================================
--- net-2.6.orig/drivers/net/veth.c
+++ net-2.6/drivers/net/veth.c
@@ -30,7 +30,6 @@ struct veth_net_stats {
 
 struct veth_priv {
 	struct net_device *peer;
-	struct net_device *dev;
 	struct list_head list;
 	struct veth_net_stats *stats;
 	unsigned ip_summed;
@@ -420,12 +419,10 @@ static int veth_newlink(struct net_devic
 	 */
 
 	priv = netdev_priv(dev);
-	priv->dev = dev;
 	priv->peer = peer;
 	list_add(&priv->list, &veth_list);
 
 	priv = netdev_priv(peer);
-	priv->dev = peer;
 	priv->peer = dev;
 	INIT_LIST_HEAD(&priv->list);
 	return 0;

-- 

[patch 2/2] veth: remove unused list

[Daniel Lezcano]

[-- Attachment #1: remove-unused-veth-list.patch --]
[-- Type: text/plain, Size: 1411 bytes --]

The veth network device is stored in a list in the netdev private.
AFAICS, this list is never used so I removed this list from the code.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---
 drivers/net/veth.c |   13 -------------
 1 file changed, 13 deletions(-)

Index: net-2.6/drivers/net/veth.c
===================================================================
--- net-2.6.orig/drivers/net/veth.c
+++ net-2.6/drivers/net/veth.c
@@ -8,7 +8,6 @@
  *
  */
 
-#include <linux/list.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
 #include <linux/etherdevice.h>
@@ -30,13 +29,10 @@ struct veth_net_stats {
 
 struct veth_priv {
 	struct net_device *peer;
-	struct list_head list;
 	struct veth_net_stats *stats;
 	unsigned ip_summed;
 };
 
-static LIST_HEAD(veth_list);
-
 /*
  * ethtool interface
  */
@@ -420,11 +416,9 @@ static int veth_newlink(struct net_devic
 
 	priv = netdev_priv(dev);
 	priv->peer = peer;
-	list_add(&priv->list, &veth_list);
 
 	priv = netdev_priv(peer);
 	priv->peer = dev;
-	INIT_LIST_HEAD(&priv->list);
 	return 0;
 
 err_register_dev:
@@ -446,13 +440,6 @@ static void veth_dellink(struct net_devi
 	priv = netdev_priv(dev);
 	peer = priv->peer;
 
-	if (!list_empty(&priv->list))
-		list_del(&priv->list);
-
-	priv = netdev_priv(peer);
-	if (!list_empty(&priv->list))
-		list_del(&priv->list);
-
 	unregister_netdevice(dev);
 	unregister_netdevice(peer);
 }

-- 

Re: [patch 1/2] veth: Remove useless veth field

[David Miller]

From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Tue, 28 Oct 2008 22:11:43 +0100

> The veth private structure contains a netdev pointer refering to its peer.
> This field is never used and it is pointless because if we can access,
> the veth_priv, that means we already have the netdev which is stored
> in veth_priv->dev.
> 
> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Applied.

Re: [patch 2/2] veth: remove unused list

[David Miller]

From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Tue, 28 Oct 2008 22:11:44 +0100

> The veth network device is stored in a list in the netdev private.
> AFAICS, this list is never used so I removed this list from the code.
> 
> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

Also applied, thanks for these cleanups.