diff options
| author | Mark Brown <broonie@kernel.org> | 2016-06-29 17:28:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-06-29 17:28:16 +0100 |
| commit | 10d832d607c621c101922442f4771737296e1241 (patch) | |
| tree | 421229d6bb43c301bbf5eb97b11c5901aae66e08 /net/sctp/socket.c | |
| parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
| parent | a370f60a58ec7bad7045803041524ccdc4d79c75 (diff) | |
| download | lwn-10d832d607c621c101922442f4771737296e1241.tar.gz lwn-10d832d607c621c101922442f4771737296e1241.zip | |
Merge tag 'ib-mfd-regulator-arm-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-rn5t618
Immutable branch between MFD, Regulator and ARM, due for v4.8
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 777d0324594a..67154b848aa9 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4220,6 +4220,7 @@ int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc, info->sctpi_s_disable_fragments = sp->disable_fragments; info->sctpi_s_v4mapped = sp->v4mapped; info->sctpi_s_frag_interleave = sp->frag_interleave; + info->sctpi_s_type = sp->type; return 0; } |