aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-04-29 04:00:30 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-04-30 00:01:12 +0200
commit80c1105b0339516344f12364a599070ab1c9a41a (patch)
tree408eac16b110a5e0d9854abd91a35e0dca89f7bb /target
parent4a043dc9d46e36882afbecb20f479e335549bd4b (diff)
downloadupstream-80c1105b0339516344f12364a599070ab1c9a41a.tar.gz
upstream-80c1105b0339516344f12364a599070ab1c9a41a.tar.bz2
upstream-80c1105b0339516344f12364a599070ab1c9a41a.zip
kernel: bump 5.10 to 5.10.179
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch2
-rw-r--r--target/linux/bcm47xx/patches-5.10/280-activate_ssb_support_in_usb.patch4
-rw-r--r--target/linux/bcm53xx/patches-5.10/039-v6.2-bcma-support-SPROM-rev-11.patch2
-rw-r--r--target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch8
-rw-r--r--target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch4
-rw-r--r--target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch4
-rw-r--r--target/linux/generic/pending-5.10/655-increase_skb_pad.patch2
-rw-r--r--target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch2
8 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch b/target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch
index 92c64ac9c4..ef1e5a6b4a 100644
--- a/target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch
+++ b/target/linux/ath79/patches-5.10/425-at803x-allow-sgmii-aneg-override.patch
@@ -16,7 +16,7 @@ Submitted-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
-@@ -830,6 +830,13 @@ static int at803x_aneg_done(struct phy_d
+@@ -959,6 +959,13 @@ static int at803x_aneg_done(struct phy_d
if (!(phy_read(phydev, AT803X_PSSR) & AT803X_PSSR_MR_AN_COMPLETE)) {
phydev_warn(phydev, "803x_aneg_done: SGMII link is not ok\n");
aneg_done = 0;
diff --git a/target/linux/bcm47xx/patches-5.10/280-activate_ssb_support_in_usb.patch b/target/linux/bcm47xx/patches-5.10/280-activate_ssb_support_in_usb.patch
index de8bb4297d..f6e9e6d30a 100644
--- a/target/linux/bcm47xx/patches-5.10/280-activate_ssb_support_in_usb.patch
+++ b/target/linux/bcm47xx/patches-5.10/280-activate_ssb_support_in_usb.patch
@@ -5,7 +5,7 @@ This prevents the options from being delete with make kernel_oldconfig.
--- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig
-@@ -32,6 +32,7 @@ config BCMA_HOST_PCI
+@@ -36,6 +36,7 @@ config BCMA_HOST_PCI
config BCMA_HOST_SOC
bool "Support for BCMA in a SoC"
depends on HAS_IOMEM
@@ -15,7 +15,7 @@ This prevents the options from being delete with make kernel_oldconfig.
the memory. This only works with the Broadcom SoCs from the
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
-@@ -136,6 +136,7 @@ config SSB_SFLASH
+@@ -141,6 +141,7 @@ config SSB_SFLASH
config SSB_EMBEDDED
bool
depends on SSB_DRIVER_MIPS && SSB_PCICORE_HOSTMODE
diff --git a/target/linux/bcm53xx/patches-5.10/039-v6.2-bcma-support-SPROM-rev-11.patch b/target/linux/bcm53xx/patches-5.10/039-v6.2-bcma-support-SPROM-rev-11.patch
index 7c9eb5537e..5ebc78ca20 100644
--- a/target/linux/bcm53xx/patches-5.10/039-v6.2-bcma-support-SPROM-rev-11.patch
+++ b/target/linux/bcm53xx/patches-5.10/039-v6.2-bcma-support-SPROM-rev-11.patch
@@ -17,7 +17,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
--- a/drivers/bcma/sprom.c
+++ b/drivers/bcma/sprom.c
-@@ -165,7 +165,7 @@ static int bcma_sprom_valid(struct bcma_
+@@ -170,7 +170,7 @@ static int bcma_sprom_valid(struct bcma_
return err;
revision = sprom[words - 1] & SSB_SPROM_REVISION_REV;
diff --git a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
index 09fb69f251..dad4803848 100644
--- a/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
+++ b/target/linux/generic/backport-5.10/630-v5.15-page_pool_frag_support.patch
@@ -677,7 +677,7 @@
#if IS_ENABLED(CONFIG_NF_CONNTRACK)
#include <linux/netfilter/nf_conntrack_common.h>
#endif
-@@ -786,7 +787,8 @@ struct sk_buff {
+@@ -787,7 +788,8 @@ struct sk_buff {
fclone:2,
peeked:1,
head_frag:1,
@@ -687,7 +687,7 @@
#ifdef CONFIG_SKB_EXTENSIONS
__u8 active_extensions;
#endif
-@@ -3029,9 +3031,15 @@ static inline void skb_frag_ref(struct s
+@@ -3030,9 +3032,15 @@ static inline void skb_frag_ref(struct s
*
* Releases a reference on the paged fragment @frag.
*/
@@ -705,7 +705,7 @@
}
/**
-@@ -3043,7 +3051,7 @@ static inline void __skb_frag_unref(skb_
+@@ -3044,7 +3052,7 @@ static inline void __skb_frag_unref(skb_
*/
static inline void skb_frag_unref(struct sk_buff *skb, int f)
{
@@ -714,7 +714,7 @@
}
/**
-@@ -4642,5 +4650,12 @@ static inline u64 skb_get_kcov_handle(st
+@@ -4643,5 +4651,12 @@ static inline u64 skb_get_kcov_handle(st
#endif
}
diff --git a/target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch b/target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch
index c1014b20bc..48494d13e4 100644
--- a/target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch
+++ b/target/linux/generic/backport-5.10/740-v5.13-0006-net-dsa-b53-mmap-Add-device-tree-support.patch
@@ -24,8 +24,8 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/io.h>
-@@ -228,11 +229,65 @@ static const struct b53_io_ops b53_mmap_
- .write64 = b53_mmap_write64,
+@@ -242,11 +243,65 @@ static const struct b53_io_ops b53_mmap_
+ .phy_write16 = b53_mmap_phy_write16,
};
+static int b53_mmap_probe_of(struct platform_device *pdev,
diff --git a/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch
index a80ce4baae..fed3848a9c 100644
--- a/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch
+++ b/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch
@@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2727,6 +2727,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2728,6 +2728,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
-@@ -2858,16 +2862,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -2859,16 +2863,6 @@ static inline struct sk_buff *dev_alloc_
}
diff --git a/target/linux/generic/pending-5.10/655-increase_skb_pad.patch b/target/linux/generic/pending-5.10/655-increase_skb_pad.patch
index 0b25a76416..dafafad588 100644
--- a/target/linux/generic/pending-5.10/655-increase_skb_pad.patch
+++ b/target/linux/generic/pending-5.10/655-increase_skb_pad.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2693,7 +2693,7 @@ static inline int pskb_network_may_pull(
+@@ -2694,7 +2694,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/
#ifndef NET_SKB_PAD
diff --git a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 12a7fb5a7d..d948848cc6 100644
--- a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -863,6 +863,7 @@ struct sk_buff {
+@@ -864,6 +864,7 @@ struct sk_buff {
__u8 decrypted:1;
#endif
__u8 scm_io_uring:1;