From patchwork Mon Aug 5 12:06:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11076653 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 46AA515AC for ; Mon, 5 Aug 2019 12:07:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3443320243 for ; Mon, 5 Aug 2019 12:07:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 288BB27C2D; Mon, 5 Aug 2019 12:07:58 +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 C62DC20243 for ; Mon, 5 Aug 2019 12:07:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728455AbfHEMH5 (ORCPT ); Mon, 5 Aug 2019 08:07:57 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:17648 "EHLO mx2.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727259AbfHEMH5 (ORCPT ); Mon, 5 Aug 2019 08:07:57 -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 mx2.mailbox.org (Postfix) with ESMTPS id 62CCEA16C8; Mon, 5 Aug 2019 14:07:56 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter01.heinlein-hosting.de (spamfilter01.heinlein-hosting.de [80.241.56.115]) (amavisd-new, port 10030) with ESMTP id hqzOkoRCuOZZ; Mon, 5 Aug 2019 14:07:53 +0200 (CEST) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 06/12] header: Remove skb_xmit_more() Date: Mon, 5 Aug 2019 14:06:58 +0200 Message-Id: <20190805120704.13128-7-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 The xmit_more member was removed from struture sk_buff and the skb_xmit_more() function is not used in backports any more, just remove this code as it does not compile any more on kernel 5.2 and more recent. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/skbuff.h | 9 --------- patches/0059-skb_xmit_more/skb_no_xmit_more.cocci | 5 ----- 2 files changed, 14 deletions(-) delete mode 100644 patches/0059-skb_xmit_more/skb_no_xmit_more.cocci diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 44b2a5de..de943916 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -200,15 +200,6 @@ static inline struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, struct sk_buff *skb_clone_sk(struct sk_buff *skb); #endif -static inline bool skb_xmit_more(struct sk_buff *skb) -{ -#if LINUX_VERSION_IS_LESS(3,18,0) - return false; -#else - return skb->xmit_more; -#endif -} - #if LINUX_VERSION_IS_LESS(3,19,0) /** * __dev_alloc_pages - allocate page for network Rx diff --git a/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci b/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci deleted file mode 100644 index bf7f22e2..00000000 --- a/patches/0059-skb_xmit_more/skb_no_xmit_more.cocci +++ /dev/null @@ -1,5 +0,0 @@ -@@ -struct sk_buff *skb; -@@ --skb->xmit_more -+skb_xmit_more(skb)