diff options
| author | David S. Miller <davem@davemloft.net> | 2019-07-08 20:16:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-07-08 20:16:25 -0700 |
| commit | 6c6fbad6576fb19f93770feabcf2d0a30b4ae0e2 (patch) | |
| tree | 28a423f0030d481ca5a1ea0e66aeccb366219781 /net/sctp/stream_interleave.c | |
| parent | ccf355e52a3265624b7acadd693c849d599e9b9f (diff) | |
| parent | e55f4b8bf4622103badac8694cdabceec06f9b38 (diff) | |
Merge branch 'sctp-tidyup'
Xin Long says:
====================
sctp: tidy up some ep and asoc feature flags
This patchset is to remove some unnecessary feature flags from
sctp_assocation and move some others to the right places.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/stream_interleave.c')
| -rw-r--r-- | net/sctp/stream_interleave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c index afbf1223d91c..40c40be23fcb 100644 --- a/net/sctp/stream_interleave.c +++ b/net/sctp/stream_interleave.c @@ -1358,6 +1358,6 @@ void sctp_stream_interleave_init(struct sctp_stream *stream) struct sctp_association *asoc; asoc = container_of(stream, struct sctp_association, stream); - stream->si = asoc->intl_enable ? &sctp_stream_interleave_1 - : &sctp_stream_interleave_0; + stream->si = asoc->peer.intl_capable ? &sctp_stream_interleave_1 + : &sctp_stream_interleave_0; } |