diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /net/sctp/proc.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
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 | ||