diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /include/net/sctp/sctp.h | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'include/net/sctp/sctp.h')
| -rw-r--r-- | include/net/sctp/sctp.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 92eae0e0f3f1..1c1abce5f6b6 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
| @@ -330,17 +330,6 @@ static inline void sctp_v6_exit(void) { return; } | |||
| 330 | 330 | ||
| 331 | #endif /* #if defined(CONFIG_IPV6) */ | 331 | #endif /* #if defined(CONFIG_IPV6) */ |
| 332 | 332 | ||
| 333 | /* Some wrappers, in case crypto not available. */ | ||
| 334 | #if defined (CONFIG_CRYPTO_HMAC) | ||
| 335 | #define sctp_crypto_alloc_tfm crypto_alloc_tfm | ||
| 336 | #define sctp_crypto_free_tfm crypto_free_tfm | ||
| 337 | #define sctp_crypto_hmac crypto_hmac | ||
| 338 | #else | ||
| 339 | #define sctp_crypto_alloc_tfm(x...) NULL | ||
| 340 | #define sctp_crypto_free_tfm(x...) | ||
| 341 | #define sctp_crypto_hmac(x...) | ||
| 342 | #endif | ||
| 343 | |||
| 344 | 333 | ||
| 345 | /* Map an association to an assoc_id. */ | 334 | /* Map an association to an assoc_id. */ |
| 346 | static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc) | 335 | static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc) |