diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-29 23:04:53 -0400 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /include/net/sctp/command.h | |
| parent | 0a3108beea9143225119d5e7c72a8e2c64f3eb7d (diff) | |
| parent | 0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff) | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'include/net/sctp/command.h')
| -rw-r--r-- | include/net/sctp/command.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index 88988ab03d75..3b966802e05d 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h | |||
| @@ -77,7 +77,8 @@ typedef enum { | |||
| 77 | SCTP_CMD_HB_TIMERS_START, /* Start the heartbeat timers. */ | 77 | SCTP_CMD_HB_TIMERS_START, /* Start the heartbeat timers. */ |
| 78 | SCTP_CMD_HB_TIMER_UPDATE, /* Update a heartbeat timers. */ | 78 | SCTP_CMD_HB_TIMER_UPDATE, /* Update a heartbeat timers. */ |
| 79 | SCTP_CMD_HB_TIMERS_STOP, /* Stop the heartbeat timers. */ | 79 | SCTP_CMD_HB_TIMERS_STOP, /* Stop the heartbeat timers. */ |
| 80 | SCTP_CMD_TRANSPORT_RESET, /* Reset the status of a transport. */ | 80 | SCTP_CMD_TRANSPORT_HB_SENT, /* Reset the status of a transport. */ |
| 81 | SCTP_CMD_TRANSPORT_IDLE, /* Do manipulations on idle transport */ | ||
| 81 | SCTP_CMD_TRANSPORT_ON, /* Mark the transport as active. */ | 82 | SCTP_CMD_TRANSPORT_ON, /* Mark the transport as active. */ |
| 82 | SCTP_CMD_REPORT_ERROR, /* Pass this error back out of the sm. */ | 83 | SCTP_CMD_REPORT_ERROR, /* Pass this error back out of the sm. */ |
| 83 | SCTP_CMD_REPORT_BAD_TAG, /* Verification tags didn't match. */ | 84 | SCTP_CMD_REPORT_BAD_TAG, /* Verification tags didn't match. */ |