ipv6: Fix inet6_csk_bind_conflict()

[safe/jmp/linux-2.6] / net / ipv4 / ip_fragment.c

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 9f41bd3..75347ea 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -32,6 +32,7 @@
 #include <linux/netdevice.h>
 #include <linux/jhash.h>
 #include <linux/random.h>
+#include <linux/slab.h>
 #include <net/route.h>
 #include <net/dst.h>
 #include <net/sock.h>
@@ -234,10 +235,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);