On 30/05/17(Tue) 11:40, Alexander Bluhm wrote: > 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.
In the meantime we cannot make in_ours() return anything. So I still don't understand how our diffs are compatible.
