diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 08:08:28 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-06 08:08:38 -0700 |
commit | 163baa33552bb1c08b6bf109319505570658a8f3 (patch) | |
tree | db130209cf27ec72ecd5a7121a3c91543badc8f3 /include/net/sctp/command.h | |
parent | eb7073db1076777496495483854993165e14790f (diff) | |
parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
download | linux-163baa33552bb1c08b6bf109319505570658a8f3.tar.gz |
Merge 3.0-rc2 into tty-linus
This is needed to catch the tty patch revert in the 3.0-rc2 tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/net/sctp/command.h')
-rw-r--r-- | include/net/sctp/command.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index 2b447646ce4b..dd6847e5d6e4 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; |