---

yaml --- r: 352389 b: refs/heads/master c: f45a5c2 h: refs/heads/master i: 352387: 919d5da v: v3
git-mirror · Feb 11, 2013 · a4c388f · a4c388f
1 parent 7b752a1
commit a4c388f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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] = {