diff options
| author | David S. Miller <davem@davemloft.net> | 2016-02-01 21:44:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-01 21:44:07 -0500 |
| commit | b45efa30a626e915192a6c548cd8642379cd47cc (patch) | |
| tree | 90d8b43ebceb850b0e7852d75283aebbd2abbc00 /net/sctp/socket.c | |
| parent | 7a26019fdecdb45ff784ae4e3b7e0cc9045100ca (diff) | |
| parent | 34229b277480f46c1e9a19f027f30b074512e68b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 9bb80ec4c08f..5ca2ebfe0be8 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
| @@ -6636,6 +6636,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs) | |||
| 6636 | 6636 | ||
| 6637 | if (cmsgs->srinfo->sinfo_flags & | 6637 | if (cmsgs->srinfo->sinfo_flags & |
| 6638 | ~(SCTP_UNORDERED | SCTP_ADDR_OVER | | 6638 | ~(SCTP_UNORDERED | SCTP_ADDR_OVER | |
| 6639 | SCTP_SACK_IMMEDIATELY | | ||
| 6639 | SCTP_ABORT | SCTP_EOF)) | 6640 | SCTP_ABORT | SCTP_EOF)) |
| 6640 | return -EINVAL; | 6641 | return -EINVAL; |
| 6641 | break; | 6642 | break; |
| @@ -6659,6 +6660,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs) | |||
| 6659 | 6660 | ||
| 6660 | if (cmsgs->sinfo->snd_flags & | 6661 | if (cmsgs->sinfo->snd_flags & |
| 6661 | ~(SCTP_UNORDERED | SCTP_ADDR_OVER | | 6662 | ~(SCTP_UNORDERED | SCTP_ADDR_OVER | |
| 6663 | SCTP_SACK_IMMEDIATELY | | ||
| 6662 | SCTP_ABORT | SCTP_EOF)) | 6664 | SCTP_ABORT | SCTP_EOF)) |
| 6663 | return -EINVAL; | 6665 | return -EINVAL; |
| 6664 | break; | 6666 | break; |