diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-23 23:40:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-23 23:40:17 -0500 |
| commit | c0eea79bd2adcc4708973fdbf72a0a292aa60d71 (patch) | |
| tree | 5736f242252532e65098e13398c9609f256de548 /include | |
| parent | adb9c9ac2e82ddbae4f635a9488ea4ee0a88feb6 (diff) | |
| parent | 35eaa31e5d6b0653c11b5661572152295b45b7a7 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/xfrm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index d6111a2f0a23..004e645f3e18 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
| @@ -403,6 +403,11 @@ unsigned xfrm_spi_hash(xfrm_address_t *addr, u32 spi, u8 proto, unsigned short f | |||
| 403 | 403 | ||
| 404 | extern void __xfrm_state_destroy(struct xfrm_state *); | 404 | extern void __xfrm_state_destroy(struct xfrm_state *); |
| 405 | 405 | ||
| 406 | static inline void __xfrm_state_put(struct xfrm_state *x) | ||
| 407 | { | ||
| 408 | atomic_dec(&x->refcnt); | ||
| 409 | } | ||
| 410 | |||
| 406 | static inline void xfrm_state_put(struct xfrm_state *x) | 411 | static inline void xfrm_state_put(struct xfrm_state *x) |
| 407 | { | 412 | { |
| 408 | if (atomic_dec_and_test(&x->refcnt)) | 413 | if (atomic_dec_and_test(&x->refcnt)) |