On Tue, May 30, 2017 at 08:45:53AM +0200, Martin Pieuchot wrote: > On 29/05/17(Mon) 23:45, Alexander Bluhm wrote: > > Hi, > > > > Convert ip_input(), ip_our(), ip_deliver() functions to pr_input > > parameter passing and protocol return style. Reset mp to NULL in > > a few places to fail at mbuf use after free. Rename ipv4_input() > > to ip_input(). > > > > Goal is to prepare the code that both mpi@'s and bluhm@'s diff > > apply. > > > > ok? > > I don't understand how I'm suppose to rebase my diff on top of this > one. ip_ours() is now taking multiple arguments.
My diff has to pass down the mp from ip_input() to ip_deliver(). Your diff places a queue into that path. The queue is temporary and can go away when we unlock the protocol input path. I am trying to create incremental diffs that cover both cases. The alternative is, that we commit my diff or your diff now and merge the other one. I can also convert my diff that all functions take the minimum number of arguments. Currently my goal is that all IPv4 and IPv6 input functions behave like pr_input for consistency. That is ip_input ip_ours ip_deliver ip6_input ip6_ours ip6_deliver ip6_hbhchcheck bluhm
