From de5f660265f2ce9c1190e69222c2efb1bec7c1aa Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Thu, 3 Jun 2010 04:13:21 +0000 Subject: [PATCH] --- yaml --- r: 202661 b: refs/heads/master c: 4736022844fe694c4ee971fa2b6c1cb38dadbc78 h: refs/heads/master i: 202659: 32c6bb90414cfc2db459262532ba9dda31f1d31a v: v3 --- [refs] | 2 +- trunk/net/ipv4/route.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ae53b53455f2..835744ffb999 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc10502dba37d3b210efd9f3867212298f13b78e +refs/heads/master: 4736022844fe694c4ee971fa2b6c1cb38dadbc78 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 1cfe0d199e7c..7b8eacd5ac26 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -1957,22 +1957,22 @@ static void ip_handle_martian_source(struct net_device *dev, #endif } +/* called in rcu_read_lock() section */ static int __mkroute_input(struct sk_buff *skb, struct fib_result *res, struct in_device *in_dev, __be32 daddr, __be32 saddr, u32 tos, struct rtable **result) { - struct rtable *rth; int err; struct in_device *out_dev; - unsigned flags = 0; + unsigned int flags = 0; __be32 spec_dst; u32 itag; /* get a working reference to the output device */ - out_dev = in_dev_get(FIB_RES_DEV(*res)); + out_dev = __in_dev_get_rcu(FIB_RES_DEV(*res)); if (out_dev == NULL) { if (net_ratelimit()) printk(KERN_CRIT "Bug in ip_route_input" \ @@ -2053,8 +2053,6 @@ static int __mkroute_input(struct sk_buff *skb, *result = rth; err = 0; cleanup: - /* release the working reference to the output device */ - in_dev_put(out_dev); return err; }