From dad13e2d2dd793868908a60714c679e36271a8b0 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Tue, 2 Feb 2010 11:46:50 -0800 Subject: [PATCH] --- yaml --- r: 183779 b: refs/heads/master c: d1c9ae6d1e7b95cedc8e39e8949e795379a0669e h: refs/heads/master i: 183777: e2deebae29aa96469043a5605c38b1cdfb09d58a 183775: 754a1f404d015e37f5a3c3c043f34d995842d1be v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_fragment.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 41c75686c073..187cbaa275bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a6ace1b3d4dc65401e71fc01af100692b9f27f8 +refs/heads/master: d1c9ae6d1e7b95cedc8e39e8949e795379a0669e diff --git a/trunk/net/ipv4/ip_fragment.c b/trunk/net/ipv4/ip_fragment.c index 9f41bd311754..b59430bc041c 100644 --- a/trunk/net/ipv4/ip_fragment.c +++ b/trunk/net/ipv4/ip_fragment.c @@ -234,10 +234,9 @@ static void ip_expire(unsigned long arg) /* Send an ICMP "Fragment Reassembly Timeout" message. */ icmp_send(head, ICMP_TIME_EXCEEDED, ICMP_EXC_FRAGTIME, 0); - } - out_rcu_unlock: - rcu_read_unlock(); + rcu_read_unlock(); + } out: spin_unlock(&qp->q.lock); ipq_put(qp);