From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A451C67879 for ; Mon, 8 Oct 2018 23:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4818720C0A for ; Mon, 8 Oct 2018 23:00:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4818720C0A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726697AbeJIGOY (ORCPT ); Tue, 9 Oct 2018 02:14:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57320 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726616AbeJIGOY (ORCPT ); Tue, 9 Oct 2018 02:14:24 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 503A23002978; Mon, 8 Oct 2018 23:00:23 +0000 (UTC) Received: from warthog.procyon.org.uk (ovpn-120-149.rdu2.redhat.com [10.10.120.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1BE796A032; Mon, 8 Oct 2018 23:00:21 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <153903883882.17944.17642727588248415623.stgit@warthog.procyon.org.uk> References: <153903883882.17944.17642727588248415623.stgit@warthog.procyon.org.uk> To: netdev@vger.kernel.org Cc: dhowells@redhat.com, pabeni@redhat.com, eric.dumazet@gmail.com, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net 00/10] rxrpc: Fix packet reception code MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <19341.1539039621.1@warthog.procyon.org.uk> Date: Tue, 09 Oct 2018 00:00:21 +0100 Message-ID: <19342.1539039621@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 08 Oct 2018 23:00:23 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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