diff options
author | David S. Miller <davem@davemloft.net> | 2009-06-03 21:43:52 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-03 21:43:52 -0700 |
commit | a8c617eae4dc2ea9f3d64472233f2d3dc3c9993c (patch) | |
tree | 2a4bdf0b610c0bbdec5c1dd452b475a09b47d42f /include/net/sctp/structs.h | |
parent | 2307f866f542f3397d24f78d0efd74f4ab214a96 (diff) | |
parent | c6ba68a26645dbc5029a9faa5687ebe6fcfc53e4 (diff) |
Merge branch 'net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vxy/lksctp-dev
Diffstat (limited to 'include/net/sctp/structs.h')
-rw-r--r-- | include/net/sctp/structs.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 23f08fe1d50..edfcacf3250 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -1939,10 +1939,8 @@ void sctp_association_free(struct sctp_association *); void sctp_association_put(struct sctp_association *); void sctp_association_hold(struct sctp_association *); -struct sctp_transport *sctp_assoc_choose_init_transport( - struct sctp_association *); -struct sctp_transport *sctp_assoc_choose_shutdown_transport( - struct sctp_association *); +struct sctp_transport *sctp_assoc_choose_alter_transport( + struct sctp_association *, struct sctp_transport *); void sctp_assoc_update_retran_path(struct sctp_association *); struct sctp_transport *sctp_assoc_lookup_paddr(const struct sctp_association *, const union sctp_addr *); |