diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-14 08:12:37 -0500 |
| commit | 0134e89c7bcc9fde1da962c82a120691e185619f (patch) | |
| tree | 3e03335cf001019a2687d161e956de4f73379984 /include/net/sctp/command.h | |
| parent | c7066f70d9610df0b9406cc635fc09e86136e714 (diff) | |
| parent | 6faee60a4e82075853a437831768cc9e2e563e4e (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6
Conflicts:
net/ipv4/route.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include/net/sctp/command.h')
| -rw-r--r-- | include/net/sctp/command.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index 2c55a7ea20af..c01dc99def07 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h | |||
| @@ -111,9 +111,6 @@ typedef enum { | |||
| 111 | SCTP_CMD_LAST | 111 | SCTP_CMD_LAST |
| 112 | } sctp_verb_t; | 112 | } sctp_verb_t; |
| 113 | 113 | ||
| 114 | #define SCTP_CMD_MAX (SCTP_CMD_LAST - 1) | ||
| 115 | #define SCTP_CMD_NUM_VERBS (SCTP_CMD_MAX + 1) | ||
| 116 | |||
| 117 | /* How many commands can you put in an sctp_cmd_seq_t? | 114 | /* How many commands can you put in an sctp_cmd_seq_t? |
| 118 | * This is a rather arbitrary number, ideally derived from a careful | 115 | * This is a rather arbitrary number, ideally derived from a careful |
| 119 | * analysis of the state functions, but in reality just taken from | 116 | * analysis of the state functions, but in reality just taken from |