From d2bc6bb48b7bb4ac05155bf4c1ce28903ceaaf2c Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Wed, 16 Apr 2008 00:45:56 -0700
Subject: [PATCH] --- yaml --- r: 90745 b: refs/heads/master c:
 3a931a80cb25f905da377d1bb0ba9b1641aa579a h: refs/heads/master i:   90743:
 7051f58593a88cd6df32e54f7a4149ba064b1372 v: v3

---
 [refs]                     | 2 +-
 trunk/net/core/rtnetlink.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9a0d0d267b68..b99bb1512d8a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc54c65853dbfd2f70ff827b73344f9de4e4b501
+refs/heads/master: 3a931a80cb25f905da377d1bb0ba9b1641aa579a
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index da99ac0871bf..edc6dbfe48f2 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/net/core/rtnetlink.c
@@ -277,12 +277,12 @@ EXPORT_SYMBOL_GPL(rtnl_link_register);
  */
 void __rtnl_link_unregister(struct rtnl_link_ops *ops)
 {
-	struct net_device *dev, *n;
+	struct net_device *dev;
 	struct net *net;
 
 	for_each_net(net) {
 restart:
-		for_each_netdev_safe(net, dev, n) {
+		for_each_netdev(net, dev) {
 			if (dev->rtnl_link_ops == ops) {
 				ops->dellink(dev);
 				goto restart;