projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau...
[firefly-linux-kernel-4.4.55.git]
/
net
/
sctp
/
command.c
diff --git
a/net/sctp/command.c
b/net/sctp/command.c
index bb977330002ac56307cda341fff68b2bc828baeb..c0044019db9eca2b84eaa9b11f28500bf0fb4086 100644
(file)
--- a/
net/sctp/command.c
+++ b/
net/sctp/command.c
@@
-52,18
+52,12
@@
int sctp_init_cmd_seq(sctp_cmd_seq_t *seq)
/* Add a command to a sctp_cmd_seq_t.
* Return 0 if the command sequence is full.
*/
/* Add a command to a sctp_cmd_seq_t.
* Return 0 if the command sequence is full.
*/
-
int sctp_add_cmd
(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj)
+
void sctp_add_cmd_sf
(sctp_cmd_seq_t *seq, sctp_verb_t verb, sctp_arg_t obj)
{
{
- if (seq->next_free_slot >= SCTP_MAX_NUM_COMMANDS)
- goto fail;
+ BUG_ON(seq->next_free_slot >= SCTP_MAX_NUM_COMMANDS);
seq->cmds[seq->next_free_slot].verb = verb;
seq->cmds[seq->next_free_slot++].obj = obj;
seq->cmds[seq->next_free_slot].verb = verb;
seq->cmds[seq->next_free_slot++].obj = obj;
-
- return 1;
-
-fail:
- return 0;
}
/* Return the next command structure in a sctp_cmd_seq.
}
/* Return the next command structure in a sctp_cmd_seq.