Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / include / net / inet_frag.h

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 7374251b97879f46646fefb270c6c88f0c9061d0..39f2dc9439086b83e45b6495e712ebfe91daa2a4 100644 (file)
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -25,9 +25,9 @@ struct inet_frag_queue {
        int                     meat;
        __u8                    last_in;    /* first/last segment arrived? */
 
-#define COMPLETE               4
-#define FIRST_IN               2
-#define LAST_IN                        1
+#define INET_FRAG_COMPLETE     4
+#define INET_FRAG_FIRST_IN     2
+#define INET_FRAG_LAST_IN      1
 };
 
 #define INETFRAGS_HASHSZ               64
@@ -61,7 +61,8 @@ void inet_frag_destroy(struct inet_frag_queue *q,
                                struct inet_frags *f, int *work);
 int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f);
 struct inet_frag_queue *inet_frag_find(struct netns_frags *nf,
-               struct inet_frags *f, void *key, unsigned int hash);
+               struct inet_frags *f, void *key, unsigned int hash)
+       __releases(&f->lock);
 
 static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)
 {