From patchwork Fri Mar 20 23:39:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11450585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E54E31894 for ; Fri, 20 Mar 2020 23:40:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE0FF20753 for ; Fri, 20 Mar 2020 23:40:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726867AbgCTXkQ (ORCPT ); Fri, 20 Mar 2020 19:40:16 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:45588 "EHLO mout-p-102.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726976AbgCTXkQ (ORCPT ); Fri, 20 Mar 2020 19:40:16 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 48kgHf4DPGzKmNY; Sat, 21 Mar 2020 00:40:14 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id oe6cnk7cGRlt; Sat, 21 Mar 2020 00:40:11 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 6/8] backports: netdevice.h: Add return value to napi_complete() Date: Sat, 21 Mar 2020 00:39:48 +0100 Message-Id: <20200320233950.32257-7-hauke@hauke-m.de> In-Reply-To: <20200320233950.32257-1-hauke@hauke-m.de> References: <20200320233950.32257-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org mt76 checks the return value of napi_complete() now, add the same handling as already done for napi_complete_done(). Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/netdevice.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index 76b57e4d..a71ed590 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -302,7 +302,13 @@ static inline bool backport_napi_complete_done(struct napi_struct *n, int work_d #endif /* < 3.19 */ return true; } + +static inline bool backport_napi_complete(struct napi_struct *n) +{ + return backport_napi_complete_done(n, 0); +} #define napi_complete_done LINUX_BACKPORT(napi_complete_done) +#define napi_complete LINUX_BACKPORT(napi_complete) #endif /* < 4.10 */ #if LINUX_VERSION_IS_LESS(4,5,0)