Re: [PATCH 6/7] sctp: Convert to genradix

From: Marcelo Ricardo Leitner
Date: Mon Dec 17 2018 - 15:59:21 EST


On Mon, Dec 17, 2018 at 12:50:01PM -0800, Andrew Morton wrote:
> On Mon, 17 Dec 2018 08:19:28 -0500 Kent Overstreet <kent.overstreet@xxxxxxxxx> wrote:
>
> > @@ -535,9 +470,6 @@ int sctp_send_add_streams(struct sctp_association *asoc,
> > goto out;
> > }
> >
> > - stream->incnt = incnt;
> > - stream->outcnt = outcnt;
> > -
> > asoc->strreset_outstanding = !!out + !!in;
> >
>
> I'm seeing a reject here for some reason. Using todays's linux-next,
> but there are no changes against net/sctp/stream.c in -next. The
> assignment to stream->incnt has disappeared. I did this:
>
> @@ -535,8 +470,6 @@ int sctp_send_add_streams(struct sctp_as
> goto out;
> }
>
> - stream->outcnt = outcnt;
> -
> asoc->strreset_outstanding = !!out + !!in;
>
> out:

That's because of
e1e46479847e ("sctp: not increase stream's incnt before sending addstrm_in request")
https://www.mail-archive.com/netdev@xxxxxxxxxxxxxxx/msg255306.html
and what you did is the right merge fix for this.

>
>
> We're at 4.20-rc7 and this series is rather large. I'll merge them all
> to see what happens, but I don't think it's 4.21-rc1 material?

Would be nice to be conservative here. It's the first time this change
is being proposed for SCTP stack and testing was probably very
limited.