From patchwork Fri Feb 21 08:56:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 11395839 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 EB889196C for ; Fri, 21 Feb 2020 08:56:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C95AC206DB for ; Fri, 21 Feb 2020 08:56:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730680AbgBUI4e (ORCPT ); Fri, 21 Feb 2020 03:56:34 -0500 Received: from s3.sipsolutions.net ([144.76.43.62]:54714 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730373AbgBUI4e (ORCPT ); Fri, 21 Feb 2020 03:56:34 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.93) (envelope-from ) id 1j546q-00EncU-DT; Fri, 21 Feb 2020 09:56:32 +0100 From: Johannes Berg To: backports@vger.kernel.org Cc: Hauke Mehrtens Subject: [PATCH 05/15] backports: Do not access rx_count and rx_list attributes Date: Fri, 21 Feb 2020 09:56:14 +0100 Message-Id: <20200221085624.6213-3-johannes@sipsolutions.net> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200221085624.6213-1-johannes@sipsolutions.net> References: <20200221085624.6213-1-johannes@sipsolutions.net> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org From: Hauke Mehrtens The rx_count and rx_list attributes were only added in kernel 5.4 in commit 323ebb61e32b ("net: use listified RX for handling GRO_NORMAL skbs") Signed-off-by: Hauke Mehrtens Link: https://lore.kernel.org/r/20200126231336.2573-1-hauke@hauke-m.de Signed-off-by: Johannes Berg --- patches/0092-listified-rx/iwlwifi.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 patches/0092-listified-rx/iwlwifi.patch diff --git a/patches/0092-listified-rx/iwlwifi.patch b/patches/0092-listified-rx/iwlwifi.patch new file mode 100644 index 000000000000..925010fd5a5c --- /dev/null +++ b/patches/0092-listified-rx/iwlwifi.patch @@ -0,0 +1,19 @@ +The rx_count and rx_list attributes were only added in kernel 5.4 in +commit 323ebb61e32b ("net: use listified RX for handling GRO_NORMAL skbs") + +--- a/drivers/net/wireless/intel/iwlwifi/pcie/rx.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/rx.c +@@ -1531,11 +1531,13 @@ out: + if (napi->poll) { + napi_gro_flush(napi, false); + ++#if LINUX_VERSION_IS_GEQ(5,4,0) + if (napi->rx_count) { + netif_receive_skb_list(&napi->rx_list); + INIT_LIST_HEAD(&napi->rx_list); + napi->rx_count = 0; + } ++#endif + } + + iwl_pcie_rxq_restock(trans, rxq);