aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/sctp
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-03-24 01:54:03 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-24 01:54:03 -0400
commit06802a819a0a2d31c952c0624cea6cd00e4e50da (patch)
tree8ccd7c668c7fbd8f08cb89426006040217caf3f1 /include/net/sctp
parent9bd512f619cc116b7830134d7c9f6e404a38c7bf (diff)
parent8f3ea33a5078a09eba12bfe57424507809367756 (diff)
Merge branch 'master' of ../net-2.6/
Conflicts: net/ipv6/ndisc.c
Diffstat (limited to 'include/net/sctp')
-rw-r--r--include/net/sctp/sctp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index dbfde62f3608..90b1e8d23b16 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -384,7 +384,7 @@ void sctp_v6_del_protocol(void);
384 384
385#else /* #ifdef defined(CONFIG_IPV6) */ 385#else /* #ifdef defined(CONFIG_IPV6) */
386 386
387static inline void sctp_v6_pf_init(void) { return 0; } 387static inline void sctp_v6_pf_init(void) { return; }
388static inline void sctp_v6_pf_exit(void) { return; } 388static inline void sctp_v6_pf_exit(void) { return; }
389static inline int sctp_v6_protosw_init(void) { return 0; } 389static inline int sctp_v6_protosw_init(void) { return 0; }
390static inline void sctp_v6_protosw_exit(void) { return; } 390static inline void sctp_v6_protosw_exit(void) { return; }