aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.10
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-07-29 12:25:26 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-29 23:03:41 +0200
commit7be62b1187bb7e21bcdaadfc3d47713a91f05898 (patch)
tree2d78088345f99ff7a3ceb77671885fa14d0e3a5d /target/linux/generic/pending-5.10
parent56760c0b1316a0e379ff141b895c2929f0dace8d (diff)
downloadupstream-7be62b1187bb7e21bcdaadfc3d47713a91f05898.tar.gz
upstream-7be62b1187bb7e21bcdaadfc3d47713a91f05898.tar.bz2
upstream-7be62b1187bb7e21bcdaadfc3d47713a91f05898.zip
kernel: bump 5.10 to 5.10.134
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/pending-5.10')
-rw-r--r--target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
index d907006fa4..eb0478e0c6 100644
--- a/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
+++ b/target/linux/generic/pending-5.10/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
@@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
struct rtnl_link {
rtnl_doit_func doit;
-@@ -4695,7 +4695,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -4684,7 +4684,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
brport_nla_put_flag(skb, flags, mask,
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
brport_nla_put_flag(skb, flags, mask,