diff --git a/[refs] b/[refs]
index acd7abebdabd..6b87e23614e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec733b15a3ef0b5759141a177f8044a2f40c41e7
+refs/heads/master: 99fe3c391d50d381687fd84ed0ab22d57079e41f
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 2d01f18f303a..a03aab45e84f 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -772,14 +772,17 @@ EXPORT_SYMBOL(__dev_getfirstbyhwtype);
 
 struct net_device *dev_getfirstbyhwtype(struct net *net, unsigned short type)
 {
-	struct net_device *dev;
+	struct net_device *dev, *ret = NULL;
 
-	rtnl_lock();
-	dev = __dev_getfirstbyhwtype(net, type);
-	if (dev)
-		dev_hold(dev);
-	rtnl_unlock();
-	return dev;
+	rcu_read_lock();
+	for_each_netdev_rcu(net, dev)
+		if (dev->type == type) {
+			dev_hold(dev);
+			ret = dev;
+			break;
+		}
+	rcu_read_unlock();
+	return ret;
 }
 EXPORT_SYMBOL(dev_getfirstbyhwtype);