diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-01 03:30:39 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-01 03:30:39 (GMT) |
| commit | e11ec900cfbea3d8f6a188674ee6fcb65f2a73d6 (patch) | |
| tree | 55f5b27cdec71fdaa918b04d554b43fa16413f3f /include | |
| parent | e12ca23d41bd157354a5d1aadff30211a410c53a (diff) | |
| parent | 948252cb9e01d65a89ecadf67be5018351eee15e (diff) | |
| download | linux-e11ec900cfbea3d8f6a188674ee6fcb65f2a73d6.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sctp/command.h | 1 | ||||
| -rw-r--r-- | include/net/sctp/structs.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index 2b44764..dd6847e 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h @@ -107,6 +107,7 @@ typedef enum { SCTP_CMD_UPDATE_INITTAG, /* Update peer inittag */ SCTP_CMD_SEND_MSG, /* Send the whole use message */ SCTP_CMD_SEND_NEXT_ASCONF, /* Send the next ASCONF after ACK */ + SCTP_CMD_PURGE_ASCONF_QUEUE, /* Purge all asconf queues.*/ SCTP_CMD_LAST } sctp_verb_t; diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 795f488..7df327a 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -1993,7 +1993,7 @@ void sctp_assoc_clean_asconf_ack_cache(const struct sctp_association *asoc); struct sctp_chunk *sctp_assoc_lookup_asconf_ack( const struct sctp_association *asoc, __be32 serial); - +void sctp_asconf_queue_teardown(struct sctp_association *asoc); int sctp_cmp_addr_exact(const union sctp_addr *ss1, const union sctp_addr *ss2); |