5.4-stable patches

added patches:
	net-dsa-mv8e6xxx-fix-stub-function-parameters.patch

diff --git a/queue-5.4/net-dsa-mv8e6xxx-fix-stub-function-parameters.patch b/queue-5.4/net-dsa-mv8e6xxx-fix-stub-function-parameters.patch
new file mode 100644 (file)
index 0000000..4c1085f
--- /dev/null
+++ b/queue-5.4/net-dsa-mv8e6xxx-fix-stub-function-parameters.patch
@@ -0,0 +1,32 @@
+From 64a26007a8f51442a9efddf7d98d50e2ca4349cd Mon Sep 17 00:00:00 2001
+From: Andrew Lunn <andrew@lunn.ch>
+Date: Thu, 7 Nov 2019 01:18:00 +0100
+Subject: net: dsa: mv8e6xxx: Fix stub function parameters
+
+From: Andrew Lunn <andrew@lunn.ch>
+
+commit 64a26007a8f51442a9efddf7d98d50e2ca4349cd upstream.
+
+mv88e6xxx_g2_atu_stats_get() takes two parameters. Make the stub
+function also take two, otherwise we get compile errors.
+
+Fixes: c5f299d59261 ("net: dsa: mv88e6xxx: global1_atu: Add helper for get next")
+Signed-off-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/dsa/mv88e6xxx/global2.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/dsa/mv88e6xxx/global2.h
++++ b/drivers/net/dsa/mv88e6xxx/global2.h
+@@ -533,7 +533,8 @@ static inline int mv88e6xxx_g2_atu_stats
+       return -EOPNOTSUPP;
+ }
+ 
+-static inline int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip)
++static inline int mv88e6xxx_g2_atu_stats_get(struct mv88e6xxx_chip *chip,
++                                           u16 *stats)
+ {
+       return -EOPNOTSUPP;
+ }

diff --git a/queue-5.4/series b/queue-5.4/series
index b58d6a752330ad2ef6669f374a32de4a2a5f0230..08356a4d08db7b435c01f567b1527e66c8f50c0b 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -130,3 +130,4 @@ usb-dwc3-core-prevent-usb-core-invalid-event-buffer-address-access.patch
 usb-dwc3-st-fix-probed-platform-device-ref-count-on-probe-error-path.patch
 usb-dwc3-st-add-missing-depopulate-in-probe-error-path.patch
 usb-core-sysfs-unmerge-usb3_hardware_lpm_attr_group-in-remove_power_attributes.patch
+net-dsa-mv8e6xxx-fix-stub-function-parameters.patch