From patchwork Fri Aug 14 14:16:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 11714653 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 B5E2914F6 for ; Fri, 14 Aug 2020 14:17:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 94522206B2 for ; Fri, 14 Aug 2020 14:17:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nbd.name header.i=@nbd.name header.b="qhW+uhDd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728072AbgHNORJ (ORCPT ); Fri, 14 Aug 2020 10:17:09 -0400 Received: from nbd.name ([46.4.11.11]:60384 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727964AbgHNORJ (ORCPT ); Fri, 14 Aug 2020 10:17:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject :To:From:Sender:Reply-To:Cc:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=MqW5V2pmwkeUhR4O8G0JPacK2/TwfocGM58JOs2y9yw=; b=qhW+uhDdrsddgDU9T70FM7yQFR gOYuZTTcUTTNSA9mL49ksEF54c0qsYV7tZqpqf8rSqkkoiSTs8OTz68zSDqc3HPFJozt8UC9mDI/P 5JKnbzYcs3KBS2OjKuArDQtahLl9zZd/KMz+hvOk+WYptsJ06qTZ9lGRjGo8ZFUk+Q5k=; Received: from p54ae996c.dip0.t-ipconnect.de ([84.174.153.108] helo=localhost.localdomain) by ds12 with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.89) (envelope-from ) id 1k6aVv-0002Bj-Ok for backports@vger.kernel.org; Fri, 14 Aug 2020 16:16:59 +0200 From: Felix Fietkau To: backports@vger.kernel.org Subject: [PATCH 1/2] backports: add netif_receive_skb_list Date: Fri, 14 Aug 2020 16:16:57 +0200 Message-Id: <20200814141658.5384-1-nbd@nbd.name> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org It will be needed by pending mac80211 changes Signed-off-by: Felix Fietkau --- backport/backport-include/linux/netdevice.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index edb0aaf33cde..ba3d352350ad 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -372,6 +372,18 @@ static inline int _bp_netdev_upper_dev_link(struct net_device *dev, macro_dispatcher(netdev_upper_dev_link, __VA_ARGS__)(__VA_ARGS__) #endif +#if LINUX_VERSION_IS_LESS(4,20,0) +static inline void netif_receive_skb_list(struct list_head *head) +{ + struct sk_buff *skb, *next; + + list_for_each_entry_safe(skb, next, head, list) { + skb_list_del_init(skb); + netif_receive_skb(skb); + } +} +#endif + #if LINUX_VERSION_IS_LESS(5,0,0) static inline int backport_dev_open(struct net_device *dev, struct netlink_ext_ack *extack) { From patchwork Fri Aug 14 14:16:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 11714651 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 68F1E739 for ; Fri, 14 Aug 2020 14:17:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 37AB320885 for ; Fri, 14 Aug 2020 14:17:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nbd.name header.i=@nbd.name header.b="oTVuW3jG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728332AbgHNORJ (ORCPT ); Fri, 14 Aug 2020 10:17:09 -0400 Received: from nbd.name ([46.4.11.11]:60386 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728072AbgHNORJ (ORCPT ); Fri, 14 Aug 2020 10:17:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3YyjcVIAj1+fiNkcdhKb5jeX++/WMHi673KmyN2LbZo=; b=oTVuW3jGLzDUbqOSjcahTydsNs qCF7UuYUHwsR1dXUszjUJnxCBBXhKKird+d1aI3rd6qzw2RCqasRWKNL8uP7TIvUWYkd3+AlyWmGo sJARal1g6xk66hsp9Z6UzwP+8k34d51rzMeh4PWLm7RCPlz8zMPYE8N4kiB/dSskdam4=; Received: from p54ae996c.dip0.t-ipconnect.de ([84.174.153.108] helo=localhost.localdomain) by ds12 with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.89) (envelope-from ) id 1k6aVv-0002Bj-Ue for backports@vger.kernel.org; Fri, 14 Aug 2020 16:17:00 +0200 From: Felix Fietkau To: backports@vger.kernel.org Subject: [PATCH 2/2] backports: add skb_list_del_init Date: Fri, 14 Aug 2020 16:16:58 +0200 Message-Id: <20200814141658.5384-2-nbd@nbd.name> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200814141658.5384-1-nbd@nbd.name> References: <20200814141658.5384-1-nbd@nbd.name> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org It will be needed by pending mac80211 changes Signed-off-by: Felix Fietkau --- backport/backport-include/linux/skbuff.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 3ed990d0d2ef..893df783a263 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -385,6 +385,12 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb) skb->next = NULL; } #endif /* 4.19.10 <= x < 4.20 */ + +static inline void skb_list_del_init(struct sk_buff *skb) +{ + __list_del_entry(&skb->list); + skb_mark_not_on_list(skb); +} #endif #if LINUX_VERSION_IS_LESS(4,11,0)