From: Greg Kroah-Hartman Date: Thu, 4 Mar 2021 15:04:47 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v4.4.260~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b63b5655f73e91e58662cd0f4720e160a0625a5;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: dt-bindings-net-btusb-dt-fix-s-interrupt-name-interrupt-names.patch net-bridge-use-switchdev-for-port-flags-set-through-sysfs-too.patch --- diff --git a/queue-4.19/dt-bindings-net-btusb-dt-fix-s-interrupt-name-interrupt-names.patch b/queue-4.19/dt-bindings-net-btusb-dt-fix-s-interrupt-name-interrupt-names.patch new file mode 100644 index 00000000000..0e32fee59ab --- /dev/null +++ b/queue-4.19/dt-bindings-net-btusb-dt-fix-s-interrupt-name-interrupt-names.patch @@ -0,0 +1,33 @@ +From f288988930e93857e0375bdf88bb670c312b82eb Mon Sep 17 00:00:00 2001 +From: Geert Uytterhoeven +Date: Thu, 14 Jan 2021 14:13:33 +0100 +Subject: dt-bindings: net: btusb: DT fix s/interrupt-name/interrupt-names/ + +From: Geert Uytterhoeven + +commit f288988930e93857e0375bdf88bb670c312b82eb upstream. + +The standard DT property name is "interrupt-names". + +Fixes: fd913ef7ce619467 ("Bluetooth: btusb: Add out-of-band wakeup support") +Signed-off-by: Geert Uytterhoeven +Acked-by: Rob Herring +Reviewed-by: Brian Norris +Acked-by: Rajat Jain +Signed-off-by: Marcel Holtmann +Signed-off-by: Greg Kroah-Hartman +--- + Documentation/devicetree/bindings/net/btusb.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Documentation/devicetree/bindings/net/btusb.txt ++++ b/Documentation/devicetree/bindings/net/btusb.txt +@@ -35,7 +35,7 @@ Following example uses irq pin number 3 + compatible = "usb1286,204e"; + reg = <1>; + interrupt-parent = <&gpio0>; +- interrupt-name = "wakeup"; ++ interrupt-names = "wakeup"; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; + }; + }; diff --git a/queue-4.19/net-bridge-use-switchdev-for-port-flags-set-through-sysfs-too.patch b/queue-4.19/net-bridge-use-switchdev-for-port-flags-set-through-sysfs-too.patch new file mode 100644 index 00000000000..d20f6d5eaf6 --- /dev/null +++ b/queue-4.19/net-bridge-use-switchdev-for-port-flags-set-through-sysfs-too.patch @@ -0,0 +1,52 @@ +From 8043c845b63a2dd88daf2d2d268a33e1872800f0 Mon Sep 17 00:00:00 2001 +From: Vladimir Oltean +Date: Sun, 7 Feb 2021 21:47:33 +0200 +Subject: net: bridge: use switchdev for port flags set through sysfs too + +From: Vladimir Oltean + +commit 8043c845b63a2dd88daf2d2d268a33e1872800f0 upstream. + +Looking through patchwork I don't see that there was any consensus to +use switchdev notifiers only in case of netlink provided port flags but +not sysfs (as a sort of deprecation, punishment or anything like that), +so we should probably keep the user interface consistent in terms of +functionality. + +http://patchwork.ozlabs.org/project/netdev/patch/20170605092043.3523-3-jiri@resnulli.us/ +http://patchwork.ozlabs.org/project/netdev/patch/20170608064428.4785-3-jiri@resnulli.us/ + +Fixes: 3922285d96e7 ("net: bridge: Add support for offloading port attributes") +Signed-off-by: Vladimir Oltean +Acked-by: Nikolay Aleksandrov +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + net/bridge/br_sysfs_if.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +--- a/net/bridge/br_sysfs_if.c ++++ b/net/bridge/br_sysfs_if.c +@@ -59,9 +59,8 @@ static BRPORT_ATTR(_name, 0644, \ + static int store_flag(struct net_bridge_port *p, unsigned long v, + unsigned long mask) + { +- unsigned long flags; +- +- flags = p->flags; ++ unsigned long flags = p->flags; ++ int err; + + if (v) + flags |= mask; +@@ -69,6 +68,10 @@ static int store_flag(struct net_bridge_ + flags &= ~mask; + + if (flags != p->flags) { ++ err = br_switchdev_set_port_flag(p, flags, mask); ++ if (err) ++ return err; ++ + p->flags = flags; + br_port_flags_change(p, mask); + } diff --git a/queue-4.19/series b/queue-4.19/series index a330dc12886..38d7c8442cc 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -14,3 +14,5 @@ xfs-fix-assert-failure-in-xfs_setattr_size.patch smackfs-restrict-bytes-count-in-smackfs-write-functions.patch net-fix-up-truesize-of-cloned-skb-in-skb_prepare_for_shift.patch mm-hugetlb.c-fix-unnecessary-address-expansion-of-pmd-sharing.patch +net-bridge-use-switchdev-for-port-flags-set-through-sysfs-too.patch +dt-bindings-net-btusb-dt-fix-s-interrupt-name-interrupt-names.patch