diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 02:04:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-05 02:04:07 -0400 |
commit | fbc1ec2efe665c07c8c71f9f19edb018f7984107 (patch) | |
tree | e7df9dac12c640a83ce8859300e061f1f8913ecd /net/sctp/proc.c | |
parent | 02baff325462cc7e81241b21959c5e62e7ca575e (diff) | |
parent | c6935931c1894ff857616ff8549b61236a19148f (diff) |
Merge 4.8-rc5 into char-misc-next
We want the fixes in here for merging and testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/sctp/proc.c')
-rw-r--r-- | net/sctp/proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sctp/proc.c b/net/sctp/proc.c index 4cb5aedfe3ee..ef8ba77a5bea 100644 --- a/net/sctp/proc.c +++ b/net/sctp/proc.c | |||
@@ -293,6 +293,7 @@ static void *sctp_transport_seq_start(struct seq_file *seq, loff_t *pos) | |||
293 | return ERR_PTR(err); | 293 | return ERR_PTR(err); |
294 | } | 294 | } |
295 | 295 | ||
296 | iter->start_fail = 0; | ||
296 | return sctp_transport_get_idx(seq_file_net(seq), &iter->hti, *pos); | 297 | return sctp_transport_get_idx(seq_file_net(seq), &iter->hti, *pos); |
297 | } | 298 | } |
298 | 299 | ||