diff options
| author | David S. Miller <davem@davemloft.net> | 2014-10-08 16:22:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-10-08 16:22:22 -0400 |
| commit | 64b1f00a0830e1c53874067273a096b228d83d36 (patch) | |
| tree | dd547b0f1d431d0995b8eaa711cedb92399f31fe /include | |
| parent | 16b99a4f6644d58c94acb4b4253e84049de588c5 (diff) | |
| parent | 5301e3e117d88ef0967ce278912e54757f1a31a2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sctp/command.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h index f22538e68245..d4a20d00461c 100644 --- a/include/net/sctp/command.h +++ b/include/net/sctp/command.h | |||
| @@ -115,7 +115,7 @@ typedef enum { | |||
| 115 | * analysis of the state functions, but in reality just taken from | 115 | * analysis of the state functions, but in reality just taken from |
| 116 | * thin air in the hopes othat we don't trigger a kernel panic. | 116 | * thin air in the hopes othat we don't trigger a kernel panic. |
| 117 | */ | 117 | */ |
| 118 | #define SCTP_MAX_NUM_COMMANDS 14 | 118 | #define SCTP_MAX_NUM_COMMANDS 20 |
| 119 | 119 | ||
| 120 | typedef union { | 120 | typedef union { |
| 121 | void *zero_all; /* Set to NULL to clear the entire union */ | 121 | void *zero_all; /* Set to NULL to clear the entire union */ |