[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <19342.1539039621@warthog.procyon.org.uk>
Date: Tue, 09 Oct 2018 00:00:21 +0100
From: David Howells <dhowells@...hat.com>
To: netdev@...r.kernel.org
Cc: dhowells@...hat.com, pabeni@...hat.com, eric.dumazet@...il.com,
linux-afs@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH net 00/10] rxrpc: Fix packet reception code
Note that there's a conflict with net-next/master versus:
d2944b1c66a502ada8aa67f508cd29ecbf035892
rxrpc: Use rxrpc_free_skb() rather than rxrpc_lose_skb()
The issue is this change in net/rxrpc/input.c:
- rxrpc_lose_skb(skb, rxrpc_skb_rx_lost);
+ rxrpc_free_skb(skb, rxrpc_skb_rx_lost);
return;
The return statement returns 0 in one of the patches here and should do so in
the resulting merge.
David
Powered by blists - more mailing lists