From 9e23ce520570329d022fa9a6dc11d701b62c32ad Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Tue, 28 Oct 2008 22:08:19 -0700
Subject: [PATCH] --- yaml --- r: 121515 b: refs/heads/master c:
 bb7bba3d56963be59bc6764c8021290ed55205ad h: refs/heads/master i:   121513:
 2bb5b24cf6d99612b9bdd17cd5301db32edf0f63   121511:
 952875acc771f409e752a9044010d418b2ba0a4d v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/veth.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 701ef4cc57da..46a585acaaea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fdb46ee752ed05c94bac71fe3decdb5175ec6e1f
+refs/heads/master: bb7bba3d56963be59bc6764c8021290ed55205ad
diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c
index 31cd817f33f9..f7ea5bcefc2c 100644
--- a/trunk/drivers/net/veth.c
+++ b/trunk/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_device *dev,
 	 */
 
 	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;