diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-03-21 03:42:24 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-21 03:42:24 -0700 |
| commit | a25606c845856e5ca5ed54d23cab077e3a49bf10 (patch) | |
| tree | 1721e46532d6f48d605d401d7cee83f78f551c45 /include/net/sctp | |
| parent | [NET]: Add debugging names to __RW_LOCK_UNLOCKED macros. (diff) | |
| parent | [NET] ifb: set separate lockdep classes for queue locks (diff) | |
| download | linux-dev-a25606c845856e5ca5ed54d23cab077e3a49bf10.tar.xz linux-dev-a25606c845856e5ca5ed54d23cab077e3a49bf10.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/net/sctp')
| -rw-r--r-- | include/net/sctp/sctp.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index a653eb3e1e70..dbfde62f3608 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -375,15 +375,19 @@ static inline void sctp_sysctl_unregister(void) { return; } #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) -int sctp_v6_init(void); -void sctp_v6_exit(void); +void sctp_v6_pf_init(void); +void sctp_v6_pf_exit(void); +int sctp_v6_protosw_init(void); +void sctp_v6_protosw_exit(void); int sctp_v6_add_protocol(void); void sctp_v6_del_protocol(void); #else /* #ifdef defined(CONFIG_IPV6) */ -static inline int sctp_v6_init(void) { return 0; } -static inline void sctp_v6_exit(void) { return; } +static inline void sctp_v6_pf_init(void) { return 0; } +static inline void sctp_v6_pf_exit(void) { return; } +static inline int sctp_v6_protosw_init(void) { return 0; } +static inline void sctp_v6_protosw_exit(void) { return; } static inline int sctp_v6_add_protocol(void) { return 0; } static inline void sctp_v6_del_protocol(void) { return; } |