diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/net/inet_frag.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/net/inet_frag.h')
| -rw-r--r-- | include/net/inet_frag.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h index e081eefd6f47..39f2dc943908 100644 --- a/include/net/inet_frag.h +++ b/include/net/inet_frag.h | |||
| @@ -61,7 +61,8 @@ void inet_frag_destroy(struct inet_frag_queue *q, | |||
| 61 | struct inet_frags *f, int *work); | 61 | struct inet_frags *f, int *work); |
| 62 | int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f); | 62 | int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f); |
| 63 | struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, | 63 | struct inet_frag_queue *inet_frag_find(struct netns_frags *nf, |
| 64 | struct inet_frags *f, void *key, unsigned int hash); | 64 | struct inet_frags *f, void *key, unsigned int hash) |
| 65 | __releases(&f->lock); | ||
| 65 | 66 | ||
| 66 | static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f) | 67 | static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f) |
| 67 | { | 68 | { |