From patchwork Mon Aug 5 12:07:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11076663 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2EC1315AC for ; Mon, 5 Aug 2019 12:08:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C4F0205A9 for ; Mon, 5 Aug 2019 12:08:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1076C2835B; Mon, 5 Aug 2019 12:08:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5199205A9 for ; Mon, 5 Aug 2019 12:08:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727349AbfHEMIN (ORCPT ); Mon, 5 Aug 2019 08:08:13 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:50904 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727259AbfHEMIN (ORCPT ); Mon, 5 Aug 2019 08:08:13 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 4A67051264; Mon, 5 Aug 2019 14:08:11 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id XIrBky6_hWYZ; Mon, 5 Aug 2019 14:08:07 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 10/12] patches: Do not use GRO_CONSUMED on kernel < 4.11 Date: Mon, 5 Aug 2019 14:07:02 +0200 Message-Id: <20190805120704.13128-11-hauke@hauke-m.de> In-Reply-To: <20190805120704.13128-1-hauke@hauke-m.de> References: <20190805120704.13128-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 X-Virus-Scanned: ClamAV using ClamSMTP GRO_CONSUMED was added in kernel commit 25393d3fc055 ("net: Prepare gro for packet consuming gro callbacks") in kernel 4.11. Just remove it for older kernel versions. Signed-off-by: Hauke Mehrtens --- patches/0090-remove-GRO_CONSUMED.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 patches/0090-remove-GRO_CONSUMED.patch diff --git a/patches/0090-remove-GRO_CONSUMED.patch b/patches/0090-remove-GRO_CONSUMED.patch new file mode 100644 index 00000000..a2bf2cc6 --- /dev/null +++ b/patches/0090-remove-GRO_CONSUMED.patch @@ -0,0 +1,16 @@ +GRO_CONSUMED was added in kernel commit 25393d3fc055 ("net: Prepare gro +for packet consuming gro callbacks") in kernel 4.11. Just remove it for +older kernel versions. + +--- a/drivers/net/wireless/ath/wil6210/txrx.c ++++ b/drivers/net/wireless/ath/wil6210/txrx.c +@@ -750,7 +750,9 @@ void wil_netif_rx_any(struct sk_buff *sk + [GRO_HELD] = "GRO_HELD", + [GRO_NORMAL] = "GRO_NORMAL", + [GRO_DROP] = "GRO_DROP", ++#if LINUX_VERSION_IS_GEQ(4,11,0) + [GRO_CONSUMED] = "GRO_CONSUMED", ++#endif /* > 4.11 */ + }; + + wil->txrx_ops.get_netif_rx_params(skb, &cid, &security);