From 2e3a4a51791f8ce270d2102c281a0374214da2f0 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Thu, 7 May 2020 00:39:16 +0200
Subject: [PATCH] modules: bump OpenWrt

d9244a1b5b generic: ar8216: fix unknown packet flooding for ar8229/ar8236
429e4490c4 libpcap: fix library packaging issues
e678cb1595 kernel: bump 4.14 to 4.14.179
8fa4ed9ef7 fstools: update to the latest version
5c6dfb5bc0 fstools: update to the latest version
607809dcdc mac80211: Update to version 4.19.120
96d280cc37 scripts/download: add sources CDN as first mirror
55ccb04046 upgs: Remove extra _DEFAULT_SOURCE definition
ee480c50c1 dante: Fix compile with glibc
5f0e25d966 perf: build with NO_LIBCAP=1
005adba939 mac80211: ath10k: increase rx buffer size to 2048
0974d59b5f kernel: backport fix for non-regular inodes on f2fs
f40947a8c0 ath79: indicate boot/failsafe/upgrade for NanoBeam/Nanostation AC
65cf72d5d2 ath79: add SUPPORTED_DEVICES based on ar71xx for some devices
f9ef0c5705 kernel: bump 4.14 to 4.14.178
2df0ea042d wpad-wolfssl: fix crypto_bignum_sub()
ec6cb33452 mac80211: backport fix for an no-ack tx status issue
f141cdd200 hostapd: unconditionally enable ap/mesh for wpa-cli
54b6683390 wireless-regdb: backport three upstream fixes
55591e63bc curl: backport fix for CVE-2019-15601
35ea808b97 uboot-kirkwood: fix ethernet and usb

Compile-tested: all targets
---
 modules                                       |  2 +-
 ...ackport-slub-prefetch-fix-from-v4.19.patch | 63 -----------------
 ...h10k-increase-rx-buffer-size-to-2048.patch | 70 -------------------
 3 files changed, 1 insertion(+), 134 deletions(-)
 delete mode 100644 patches/openwrt/0010-kernel-backport-slub-prefetch-fix-from-v4.19.patch
 delete mode 100644 patches/openwrt/0011-mac80211-ath10k-increase-rx-buffer-size-to-2048.patch

diff --git a/modules b/modules
index b787938f2..cef0c5dfa 100644
--- a/modules
+++ b/modules
@@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing gluon'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-19.07
-OPENWRT_COMMIT=5feb0df9bb3bd83ec49af17d2abc261fc58e2551
+OPENWRT_COMMIT=d9244a1b5b424346f20064134680c1f0a13b46e6
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-19.07
diff --git a/patches/openwrt/0010-kernel-backport-slub-prefetch-fix-from-v4.19.patch b/patches/openwrt/0010-kernel-backport-slub-prefetch-fix-from-v4.19.patch
deleted file mode 100644
index cc82990c2..000000000
--- a/patches/openwrt/0010-kernel-backport-slub-prefetch-fix-from-v4.19.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 25 Apr 2020 19:27:34 +0200
-Subject: kernel: backport slub prefetch fix from v4.19
-
-This patch fixes a regression introduced in kernel v4.14. While the
-commit message only mentions a performance penalty, the issue is
-suspected to be the cause of spurious data bus errors on MIPS CPUs
-(ar71xx target).
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/generic/backport-4.14/190-v4.19-mm-slub-restore-the-original-intention-of-prefetch_f.patch b/target/linux/generic/backport-4.14/190-v4.19-mm-slub-restore-the-original-intention-of-prefetch_f.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..06bea3e8fd36b3d9f1e9f14c6928aebc315db19c
---- /dev/null
-+++ b/target/linux/generic/backport-4.14/190-v4.19-mm-slub-restore-the-original-intention-of-prefetch_f.patch
-@@ -0,0 +1,46 @@
-+From 0882ff9190e3bc51e2d78c3aadd7c690eeaa91d5 Mon Sep 17 00:00:00 2001
-+Message-Id: <0882ff9190e3bc51e2d78c3aadd7c690eeaa91d5.1587834219.git.mschiffer@universe-factory.net>
-+From: Vlastimil Babka <vbabka@suse.cz>
-+Date: Fri, 17 Aug 2018 15:44:44 -0700
-+Subject: [PATCH] mm, slub: restore the original intention of
-+ prefetch_freepointer()
-+
-+In SLUB, prefetch_freepointer() is used when allocating an object from
-+cache's freelist, to make sure the next object in the list is cache-hot,
-+since it's probable it will be allocated soon.
-+
-+Commit 2482ddec670f ("mm: add SLUB free list pointer obfuscation") has
-+unintentionally changed the prefetch in a way where the prefetch is
-+turned to a real fetch, and only the next->next pointer is prefetched.
-+In case there is not a stream of allocations that would benefit from
-+prefetching, the extra real fetch might add a useless cache miss to the
-+allocation.  Restore the previous behavior.
-+
-+Link: http://lkml.kernel.org/r/20180809085245.22448-1-vbabka@suse.cz
-+Fixes: 2482ddec670f ("mm: add SLUB free list pointer obfuscation")
-+Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
-+Acked-by: Kees Cook <keescook@chromium.org>
-+Cc: Daniel Micay <danielmicay@gmail.com>
-+Cc: Eric Dumazet <edumazet@google.com>
-+Cc: Christoph Lameter <cl@linux.com>
-+Cc: Pekka Enberg <penberg@kernel.org>
-+Cc: David Rientjes <rientjes@google.com>
-+Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
-+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-+---
-+ mm/slub.c | 3 +--
-+ 1 file changed, 1 insertion(+), 2 deletions(-)
-+
-+--- a/mm/slub.c
-++++ b/mm/slub.c
-+@@ -269,8 +269,7 @@ static inline void *get_freepointer(stru
-+ 
-+ static void prefetch_freepointer(const struct kmem_cache *s, void *object)
-+ {
-+-	if (object)
-+-		prefetch(freelist_dereference(s, object + s->offset));
-++	prefetch(object + s->offset);
-+ }
-+ 
-+ static inline void *get_freepointer_safe(struct kmem_cache *s, void *object)
diff --git a/patches/openwrt/0011-mac80211-ath10k-increase-rx-buffer-size-to-2048.patch b/patches/openwrt/0011-mac80211-ath10k-increase-rx-buffer-size-to-2048.patch
deleted file mode 100644
index 4c6dff303..000000000
--- a/patches/openwrt/0011-mac80211-ath10k-increase-rx-buffer-size-to-2048.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Linus Lüssing <ll@simonwunderlich.de>
-Date: Wed, 5 Feb 2020 20:10:43 +0100
-Subject: mac80211: ath10k: increase rx buffer size to 2048
-
-Before, only frames with a maximum size of 1528 bytes could be
-transmitted between two 802.11s nodes.
-
-For batman-adv for instance, which adds its own header to each frame,
-we typically need an MTU of at least 1532 bytes to be able to transmit
-without fragmentation.
-
-This patch now increases the maxmimum frame size from 1528 to 1656
-bytes.
-
-Tested with two ath10k devices in 802.11s mode, as well as with
-batman-adv on top of 802.11s with forwarding disabled.
-
-Fix originally found and developed by Ben Greear.
-
-Link: https://github.com/greearb/ath10k-ct/issues/89
-Link: https://github.com/greearb/ath10k-ct/commit/9e5ab25027e0971fa24ccf93373324c08c4e992d
-Cc: Ben Greear <greearb@candelatech.com>
-Signed-off-by: Linus Lüssing <ll@simonwunderlich.de>
-Signed-off-by: Sven Eckelmann <sven@narfation.org>
-
-Forwarded: https://github.com/openwrt/openwrt/pull/2959
-
-diff --git a/package/kernel/mac80211/patches/ath/922-ath10k-increase-rx-buffer-size-to-2048.patch b/package/kernel/mac80211/patches/ath/922-ath10k-increase-rx-buffer-size-to-2048.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..f7c842f428986130002922b68daf3d29b096ddbd
---- /dev/null
-+++ b/package/kernel/mac80211/patches/ath/922-ath10k-increase-rx-buffer-size-to-2048.patch
-@@ -0,0 +1,37 @@
-+From: Linus Lüssing <ll@simonwunderlich.de>
-+Date: Wed, 5 Feb 2020 20:10:43 +0100
-+Subject: ath10k: increase rx buffer size to 2048
-+
-+Before, only frames with a maximum size of 1528 bytes could be
-+transmitted between two 802.11s nodes.
-+
-+For batman-adv for instance, which adds its own header to each frame,
-+we typically need an MTU of at least 1532 bytes to be able to transmit
-+without fragmentation.
-+
-+This patch now increases the maxmimum frame size from 1528 to 1656
-+bytes.
-+
-+Tested with two ath10k devices in 802.11s mode, as well as with
-+batman-adv on top of 802.11s with forwarding disabled.
-+
-+Fix originally found and developed by Ben Greear.
-+
-+Link: https://github.com/greearb/ath10k-ct/issues/89
-+Link: https://github.com/greearb/ath10k-ct/commit/9e5ab25027e0971fa24ccf93373324c08c4e992d
-+Cc: Ben Greear <greearb@candelatech.com>
-+Signed-off-by: Linus Lüssing <ll@simonwunderlich.de>
-+
-+Forwarded: https://patchwork.kernel.org/patch/11367055/
-+
-+--- a/drivers/net/wireless/ath/ath10k/htt.h
-++++ b/drivers/net/wireless/ath/ath10k/htt.h
-+@@ -2004,7 +2004,7 @@ struct htt_rx_desc {
-+  * Should be: sizeof(struct htt_host_rx_desc) + max rx MSDU size,
-+  * rounded up to a cache line size.
-+  */
-+-#define HTT_RX_BUF_SIZE 1920
-++#define HTT_RX_BUF_SIZE 2048
-+ #define HTT_RX_MSDU_SIZE (HTT_RX_BUF_SIZE - (int)sizeof(struct htt_rx_desc))
-+ 
-+ /* Refill a bunch of RX buffers for each refill round so that FW/HW can handle
-- 
GitLab