From 86d73631e6a67f3a1bd0daeed98ed5695e566f8a Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 23 Sep 2010 21:46:03 +0000
Subject: [PATCH] --- yaml --- r: 214766 b: refs/heads/master c:
 83180af0b0ea166adf8249f4513beb7355f9b4c9 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv4/route.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 00f21ea612c7..18daddf9244e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b4bf461f05d56ced6d6b8f3b4831adc7076f565
+refs/heads/master: 83180af0b0ea166adf8249f4513beb7355f9b4c9
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index ae1d4a41f1c6..98beda47bc99 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -2579,7 +2579,7 @@ static int ip_route_output_slow(struct net *net, struct rtable **rp,
 			goto out;
 
 		/* RACE: Check return value of inet_select_addr instead. */
-		if (__in_dev_get_rtnl(dev_out) == NULL) {
+		if (rcu_dereference_raw(dev_out->ip_ptr) == NULL) {
 			dev_put(dev_out);
 			goto out;	/* Wrong error code */
 		}