From patchwork Thu Sep 6 06:57:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10589929 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 E138669B5 for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D90A32A3A2 for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD4652A3AB; Thu, 6 Sep 2018 06:57:55 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 8AA0C2A479 for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727672AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 Received: from nbd.name ([46.4.11.11]:48218 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: MIME-Version:Content-Type:Content-Transfer-Encoding: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=R0LaSAENd7lec6CopoLsZxWQnO6Wn4KsUdFOFLdL8as=; b=e3p1AURjhzcuVsnci3u0Bhj0mw fmqO7XQiLqW8M0etiddPSYpzsPds4iSVgt0PeIekl+auEJgAxs4m4ZKFvA544FHiMUS6NY2lg+3x+ 8JEMBAA7nW6A2MteBbivdv7a7065Dlat2a3NqC42hSfhXmpTaAZ04iXOcLVGR+J3M/Qo=; Received: by maeck.lan (Postfix, from userid 501) id 18730379246C; Thu, 6 Sep 2018 08:57:50 +0200 (CEST) From: Felix Fietkau To: backports@vger.kernel.org Cc: john@phrozen.org Subject: [PATCH 1/6] backports: copy linux/overflow.h Date: Thu, 6 Sep 2018 08:57:45 +0200 Message-Id: <20180906065750.89673-1-nbd@nbd.name> X-Mailer: git-send-email 2.17.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Overflow macros are useful for further backports Signed-off-by: Felix Fietkau --- copy-list | 1 + 1 file changed, 1 insertion(+) diff --git a/copy-list b/copy-list index 5c64b6d4..21ca8070 100644 --- a/copy-list +++ b/copy-list @@ -19,6 +19,7 @@ include/linux/fixp-arith.h # This just defines some macros, simply take it include/linux/bitfield.h include/linux/average.h +include/linux/overflow.h # crypto_memneq crypto/memneq.c -> compat/memneq.c From patchwork Thu Sep 6 06:57:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10589931 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 50D1F6CB for ; Thu, 6 Sep 2018 06:57:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 442A52852D for ; Thu, 6 Sep 2018 06:57:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38AFE2A3AB; Thu, 6 Sep 2018 06:57:56 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 98D3A2852D for ; Thu, 6 Sep 2018 06:57:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727682AbeIFLbv (ORCPT ); Thu, 6 Sep 2018 07:31:51 -0400 Received: from nbd.name ([46.4.11.11]:48206 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725880AbeIFLbv (ORCPT ); Thu, 6 Sep 2018 07:31:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=v5U4MO+5WpiJJ3dIZg47xo4EgWOABuQAG6tsVvWhGH0=; b=MtVkrpBmo8oVk1hnrMtbncht1I Y4sY9+aNJrr6mGuIDTfaowK/Vq+luTzgIAExsQYKyFH1+Cr69cbpm21SqEEM8WzNru+pz1YT0kmqB s00BlnUXjY+uDVoR4W18IR8S9we2t0ujGFu2KGsWL03lRKMVOBbDqnA95p1VGCzFkeTo=; Received: by maeck.lan (Postfix, from userid 501) id 17803379246B; Thu, 6 Sep 2018 08:57:50 +0200 (CEST) From: Felix Fietkau To: backports@vger.kernel.org Cc: john@phrozen.org Subject: [PATCH 2/6] backport-include: backport kvmalloc and kvmalloc_array Date: Thu, 6 Sep 2018 08:57:46 +0200 Message-Id: <20180906065750.89673-2-nbd@nbd.name> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180906065750.89673-1-nbd@nbd.name> References: <20180906065750.89673-1-nbd@nbd.name> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Felix Fietkau --- backport/backport-include/linux/mm.h | 35 ++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/backport/backport-include/linux/mm.h b/backport/backport-include/linux/mm.h index 3234b37d..6ee5c7d8 100644 --- a/backport/backport-include/linux/mm.h +++ b/backport/backport-include/linux/mm.h @@ -3,6 +3,9 @@ #include_next #include #include +#include +#include +#include #ifndef VM_NODUMP /* @@ -123,4 +126,36 @@ static inline bool page_is_pfmemalloc(struct page *page) } #endif /* < 4.2 */ +#if LINUX_VERSION_IS_LESS(4,12,0) +#define kvmalloc LINUX_BACKPORT(kvmalloc) +static inline void *kvmalloc(size_t size, gfp_t flags) +{ + gfp_t kmalloc_flags = flags; + void *ret; + + if ((flags & GFP_KERNEL) != GFP_KERNEL) + return kmalloc(size, flags); + + if (size > PAGE_SIZE) + kmalloc_flags |= __GFP_NOWARN | __GFP_NORETRY; + + ret = kmalloc(size, flags); + if (ret || size < PAGE_SIZE) + return ret; + + return vmalloc(size); +} + +#define kvmalloc_array LINUX_BACKPORT(kvmalloc_array) +static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) +{ + size_t bytes; + + if (unlikely(check_mul_overflow(n, size, &bytes))) + return NULL; + + return kvmalloc(bytes, flags); +} +#endif + #endif /* __BACKPORT_MM_H */ From patchwork Thu Sep 6 06:57:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10589925 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 9142069B3 for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88C102A3AB for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D0762A452; Thu, 6 Sep 2018 06:57:55 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 368702A3CC for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725961AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 Received: from nbd.name ([46.4.11.11]:48214 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727672AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=bMUid2hRT5iUruawwsopGk6PKGrFFZbLMrq8V/VN/Y4=; b=s5qKxtO6Bz99pJVgHwp9wmGnxB f8OsyLO6yVFz5b572RKdIMj1KCJDZgPeqlJrioqoxIj5n8Fm6dBjEP0rxU+B5jwmlsb+pYVy4kLPb CYjk7jkJ2RrxrW+YAFib8iGcVrogJxvi9Hd7xZ3IVsC+7qR/iLKucau/4+1hMc00oESQ=; Received: by maeck.lan (Postfix, from userid 501) id 058D0379246A; Thu, 6 Sep 2018 08:57:50 +0200 (CEST) From: Felix Fietkau To: backports@vger.kernel.org Cc: john@phrozen.org Subject: [PATCH 3/6] patches: remove lib-bucket_locks.patch Date: Thu, 6 Sep 2018 08:57:47 +0200 Message-Id: <20180906065750.89673-3-nbd@nbd.name> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180906065750.89673-1-nbd@nbd.name> References: <20180906065750.89673-1-nbd@nbd.name> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Obsoleted by kvmalloc/kvmalloc_array backport Signed-off-by: Felix Fietkau --- patches/lib-bucket_locks.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 patches/lib-bucket_locks.patch diff --git a/patches/lib-bucket_locks.patch b/patches/lib-bucket_locks.patch deleted file mode 100644 index 15eeda11..00000000 --- a/patches/lib-bucket_locks.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/compat/lib-bucket_locks.c b/compat/lib-bucket_locks.c -index 266a97c5708b..405b52ca5708 100644 ---- a/compat/lib-bucket_locks.c -+++ b/compat/lib-bucket_locks.c -@@ -30,10 +30,24 @@ int alloc_bucket_spinlocks(spinlock_t ** - } - - if (sizeof(spinlock_t) != 0) { -+#if LINUX_VERSION_IS_LESS(4,12,0) -+#ifdef CONFIG_NUMA -+ if (size * sizeof(spinlock_t) > PAGE_SIZE && -+ gfp == GFP_KERNEL) -+ tlocks = vmalloc(size * sizeof(spinlock_t)); -+#endif -+ if (gfp != GFP_KERNEL) -+ gfp |= __GFP_NOWARN | __GFP_NORETRY; -+ -+ if (!tlocks) -+ tlocks = kmalloc_array(size, sizeof(spinlock_t), -+ gfp); -+#else - if (gfpflags_allow_blocking(gfp)) - tlocks = kvmalloc(size * sizeof(spinlock_t), gfp); - else - tlocks = kmalloc_array(size, sizeof(spinlock_t), gfp); -+#endif - if (!tlocks) - return -ENOMEM; - for (i = 0; i < size; i++) From patchwork Thu Sep 6 06:57:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10589923 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 62C4D6CB for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56C462A46A for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B15E2A467; Thu, 6 Sep 2018 06:57:55 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 DA3CD2A3AB for ; Thu, 6 Sep 2018 06:57:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727685AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 Received: from nbd.name ([46.4.11.11]:48212 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727664AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=lvd8t6dzGEHjNytzGiehWP2yltP6kqB5Z8St/+Bx/74=; b=IJQoYxbNq+cova53LD32pP9fui zCZttXCtbtRRHzxYRrYPvPAohd3HIWC5og8AxbR8RCxEna+jDArtRbms9nxm1m0RhhUasJRFIyIp3 VS530/IkHsJyJY+heaOM+s57cxeDjWxcWtNPDX8S5CYBwGwMY252pqRmoM87SqQjfHbI=; Received: by maeck.lan (Postfix, from userid 501) id 18E8D379246D; Thu, 6 Sep 2018 08:57:50 +0200 (CEST) From: Felix Fietkau To: backports@vger.kernel.org Cc: john@phrozen.org Subject: [PATCH 4/6] backport-include: backport ktime_get_boottime_seconds Date: Thu, 6 Sep 2018 08:57:48 +0200 Message-Id: <20180906065750.89673-4-nbd@nbd.name> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180906065750.89673-1-nbd@nbd.name> References: <20180906065750.89673-1-nbd@nbd.name> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Felix Fietkau --- backport/backport-include/linux/timekeeping.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backport/backport-include/linux/timekeeping.h b/backport/backport-include/linux/timekeeping.h index 30f9b7a9..56c3deec 100644 --- a/backport/backport-include/linux/timekeeping.h +++ b/backport/backport-include/linux/timekeeping.h @@ -24,6 +24,13 @@ static inline u64 ktime_get_boot_ns(void) } #endif /* < 3.17 */ +#if LINUX_VERSION_IS_LESS(4,18,0) +static inline time64_t ktime_get_boottime_seconds(void) +{ + return ktime_divns(ktime_get_boottime(), NSEC_PER_SEC); +} +#endif /* < 4.18 */ + #if LINUX_VERSION_IS_LESS(3,19,0) static inline time64_t ktime_get_seconds(void) { From patchwork Thu Sep 6 06:57:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10589921 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 564D3920 for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D5162A3AB for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D29E2A3E2; Thu, 6 Sep 2018 06:57:55 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 B963C2A3A7 for ; Thu, 6 Sep 2018 06:57:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725880AbeIFLbv (ORCPT ); Thu, 6 Sep 2018 07:31:51 -0400 Received: from nbd.name ([46.4.11.11]:48208 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbeIFLbv (ORCPT ); Thu, 6 Sep 2018 07:31:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=gdKsYPHNFGehyQWSrc2LkHXJV/zLKAOUXwqKV/gKwJ4=; b=HCRvHE8CDgX5vKngl11WcB5u+4 hnoHe6sdTOfPV3pG4miHc2KgA8OxYfmxMmUuowLYCqfPHjtjiKgMqyD5WOga63Jcuagyx7HrqpOX1 DofrOJK0fhn+tFMC3bPIX/THJ1s7Z8DsBB9HQTxrRGZMgZ4zb6BPum8thGzGx9D/zTrI=; Received: by maeck.lan (Postfix, from userid 501) id 194D9379246E; Thu, 6 Sep 2018 08:57:50 +0200 (CEST) From: Felix Fietkau To: backports@vger.kernel.org Cc: john@phrozen.org Subject: [PATCH 5/6] backport: copy net/rsi_91x.h Date: Thu, 6 Sep 2018 08:57:49 +0200 Message-Id: <20180906065750.89673-5-nbd@nbd.name> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180906065750.89673-1-nbd@nbd.name> References: <20180906065750.89673-1-nbd@nbd.name> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Felix Fietkau --- copy-list | 1 + 1 file changed, 1 insertion(+) diff --git a/copy-list b/copy-list index 21ca8070..f9f9396c 100644 --- a/copy-list +++ b/copy-list @@ -49,6 +49,7 @@ include/linux/spi/libertas_spi.h include/linux/platform_data/brcmfmac.h include/linux/platform_data/net-cw1200.h include/uapi/linux/nl80211.h +include/net/rsi_91x.h include/net/cfg80211.h include/net/cfg80211-wext.h From patchwork Thu Sep 6 06:57:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Fietkau X-Patchwork-Id: 10589927 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 C2D3E180E for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BACE82A3AB for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF4152A3A2; Thu, 6 Sep 2018 06:57:55 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 601EE2A3E2 for ; Thu, 6 Sep 2018 06:57:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727664AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 Received: from nbd.name ([46.4.11.11]:48216 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727683AbeIFLbw (ORCPT ); Thu, 6 Sep 2018 07:31:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=nbd.name; s=20160729; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=xD0qJ+cK8DOgleD+aPLj5eJrzYKxzmSe36idyUQPPtE=; b=pFBqTEGmb1BppgQg6sHN7R7rDI TkQipWJLVC0b7qz6qb+elSrAuJ+mE8xlj70q8VOP0xULwIMOExWhn/iH6meEwE/b/+1zbQ4IC8c6J ZmHu9fbTXPJ2e+WlOEBjxwV5YKlDGYaEwntjBCm8B/Rq4MwkS9HKC6ihPuq2PxnENFeM=; Received: by maeck.lan (Postfix, from userid 501) id 19AD0379246F; Thu, 6 Sep 2018 08:57:50 +0200 (CEST) From: Felix Fietkau To: backports@vger.kernel.org Cc: john@phrozen.org Subject: [PATCH 6/6] backport: add firmware_request_nowarn and firmware_request_cache Date: Thu, 6 Sep 2018 08:57:50 +0200 Message-Id: <20180906065750.89673-6-nbd@nbd.name> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180906065750.89673-1-nbd@nbd.name> References: <20180906065750.89673-1-nbd@nbd.name> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Felix Fietkau --- backport/backport-include/linux/firmware.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/backport/backport-include/linux/firmware.h b/backport/backport-include/linux/firmware.h index 186eec3e..b5bc16be 100644 --- a/backport/backport-include/linux/firmware.h +++ b/backport/backport-include/linux/firmware.h @@ -5,5 +5,16 @@ #if LINUX_VERSION_IS_LESS(3,14,0) #define request_firmware_direct(fw, name, device) request_firmware(fw, name, device) #endif +#if LINUX_VERSION_IS_LESS(4,18,0) +#define firmware_request_nowarn(fw, name, device) request_firmware(fw, name, device) +#endif + +#if LINUX_VERSION_IS_LESS(4,17,0) +#define firmware_request_cache LINUX_BACKPORT(firmware_request_cache) +static inline int firmware_request_cache(struct device *device, const char *name) +{ + return 0; +} +#endif #endif /* __BACKPORT_LINUX_FIRMWARE_H */