From a4c388fd6166b50d1eb22ebc163e74f12bf29992 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Fri, 8 Feb 2013 20:10:49 +0000
Subject: [PATCH] --- yaml --- r: 352389 b: refs/heads/master c:
 f45a5c267da35174e22cec955093a7513dc1623d h: refs/heads/master i:   352387:
 919d5da703cfe202aa4bccf85c79ba67ca32c808 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/veth.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2c695eded639..27f03b966095 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 715448ff52e71ed055f352ffcba1ab8e4455ff99
+refs/heads/master: f45a5c267da35174e22cec955093a7513dc1623d
diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c
index e1da42aaf9de..07a4af0aa3dc 100644
--- a/trunk/drivers/net/veth.c
+++ b/trunk/drivers/net/veth.c
@@ -426,12 +426,13 @@ static void veth_dellink(struct net_device *dev, struct list_head *head)
 	 * not being freed before one RCU grace period.
 	 */
 	RCU_INIT_POINTER(priv->peer, NULL);
-
-	priv = netdev_priv(peer);
-	RCU_INIT_POINTER(priv->peer, NULL);
-
 	unregister_netdevice_queue(dev, head);
-	unregister_netdevice_queue(peer, head);
+
+	if (peer) {
+		priv = netdev_priv(peer);
+		RCU_INIT_POINTER(priv->peer, NULL);
+		unregister_netdevice_queue(peer, head);
+	}
 }
 
 static const struct nla_policy veth_policy[VETH_INFO_MAX + 1] = {