diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2014-09-16 03:28:16 +0400 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-09-16 03:28:16 +0400 |
| commit | 7622d4905a038961da6b1c6c3fe4be6c3dad7ef9 (patch) | |
| tree | cce9f4bc0ef2de31cee8e06e2cd6358dd51fa9c5 /net/sctp/socket.c | |
| parent | 5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
| download | linux-7622d4905a038961da6b1c6c3fe4be6c3dad7ef9.tar.xz | |
Merge tag 'v3.17-rc5' from upstream
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index eb71d49e7653..634a2abb5f3a 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -4243,7 +4243,7 @@ static int sctp_getsockopt_sctp_status(struct sock *sk, int len, transport = asoc->peer.primary_path; status.sstat_assoc_id = sctp_assoc2id(asoc); - status.sstat_state = asoc->state; + status.sstat_state = sctp_assoc_to_state(asoc); status.sstat_rwnd = asoc->peer.rwnd; status.sstat_unackdata = asoc->unack_data; |