This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / net / sctp / sctp.h

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 208c6ae..053a0ac 100644 (file)
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -335,7 +335,7 @@ static inline void sctp_v6_exit(void) { return; }
 /* Map an association to an assoc_id. */
 static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc)
 {
-       return (asoc?asoc->assoc_id:0);
+       return (asoc?asoc->assoc_id:NULL);
 }
 
 /* Look up the association by its id.  */
@@ -607,14 +607,14 @@ struct sctp6_sock {
 
 /* Is a socket of this style? */
 #define sctp_style(sk, style) __sctp_style((sk), (SCTP_SOCKET_##style))
-static inline int __sctp_style(const struct sock *sk, sctp_socket_type_t style)
+int static inline __sctp_style(const struct sock *sk, sctp_socket_type_t style)
 {
        return sctp_sk(sk)->type == style;
 }
 
 /* Is the association in this state? */
 #define sctp_state(asoc, state) __sctp_state((asoc), (SCTP_STATE_##state))
-static inline int __sctp_state(const struct sctp_association *asoc,
+int static inline __sctp_state(const struct sctp_association *asoc,
                               sctp_state_t state)
 {
        return asoc->state == state;
@@ -622,7 +622,7 @@ static inline int __sctp_state(const struct sctp_association *asoc,
 
 /* Is the socket in this state? */
 #define sctp_sstate(sk, state) __sctp_sstate((sk), (SCTP_SS_##state))
-static inline int __sctp_sstate(const struct sock *sk, sctp_sock_state_t state)
+int static inline __sctp_sstate(const struct sock *sk, sctp_sock_state_t state)
 {
        return sk->sk_state == state;
 }