diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 14:22:37 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 14:22:37 +0200 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /include/net/sctp/sctp.h | |
| parent | Merge branch 'for-2.6.30' into for-2.6.31 (diff) | |
| parent | Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-6967963d6d5cac40a091d075326f0e3ccb95c58a.tar.xz linux-6967963d6d5cac40a091d075326f0e3ccb95c58a.zip | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'include/net/sctp/sctp.h')
| -rw-r--r-- | include/net/sctp/sctp.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index bbb7742195b0..9f80a7668289 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -62,13 +62,6 @@ * and will continue to evolve. */ - - -#ifdef TEST_FRAME -#undef CONFIG_SCTP_DBG_OBJCNT -#undef CONFIG_SYSCTL -#endif /* TEST_FRAME */ - #include <linux/types.h> #include <linux/slab.h> #include <linux/in.h> @@ -138,6 +131,8 @@ void sctp_write_space(struct sock *sk); unsigned int sctp_poll(struct file *file, struct socket *sock, poll_table *wait); void sctp_sock_rfree(struct sk_buff *skb); +void sctp_copy_sock(struct sock *newsk, struct sock *sk, + struct sctp_association *asoc); extern struct percpu_counter sctp_sockets_allocated; /* |