diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:36:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-20 00:36:08 -0400 |
| commit | 3d71b3b0b634b1a5ba8632fd9ec998e0e4aedfdb (patch) | |
| tree | addbc37a278a126a19e03edd8270e577c75a8829 /include/net/sctp/command.h | |
| parent | 8d4ee71ff6de5255ebfdf44fb83419d27bd06368 (diff) | |
| parent | e2a7f77a7b4ab298a38c8d1f624628456069bdb0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
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 34a1a09e5aef..807d6f1ef4b5 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h | |||
| @@ -99,6 +99,7 @@ typedef enum { | |||
| 99 | SCTP_CMD_DEL_NON_PRIMARY, /* Removes non-primary peer transports. */ | 99 | SCTP_CMD_DEL_NON_PRIMARY, /* Removes non-primary peer transports. */ |
| 100 | SCTP_CMD_T3_RTX_TIMERS_STOP, /* Stops T3-rtx pending timers */ | 100 | SCTP_CMD_T3_RTX_TIMERS_STOP, /* Stops T3-rtx pending timers */ |
| 101 | SCTP_CMD_FORCE_PRIM_RETRAN, /* Forces retrans. over primary path. */ | 101 | SCTP_CMD_FORCE_PRIM_RETRAN, /* Forces retrans. over primary path. */ |
| 102 | SCTP_CMD_SET_SK_ERR, /* Set sk_err */ | ||
| 102 | SCTP_CMD_LAST | 103 | SCTP_CMD_LAST |
| 103 | } sctp_verb_t; | 104 | } sctp_verb_t; |
| 104 | 105 | ||