layerscape: fix felix DSA driver compilation
authorRafał Miłecki <rafal@milecki.pl>
Tue, 3 Jan 2023 07:34:43 +0000 (07:34 +0000)
committerRafał Miłecki <rafal@milecki.pl>
Tue, 3 Jan 2023 10:00:30 +0000 (11:00 +0100)
It isn't used at the moment but let's fix it anyway.

This fixes:
  CC      drivers/net/dsa/ocelot/felix.o
drivers/net/dsa/ocelot/felix.c:646:22: error: initialization of 'enum dsa_tag_protocol (*)(struct dsa_switch *, int,  enum dsa_tag_protocol)' from incompatible pointer type 'enum dsa_tag_protocol (*)(struct dsa_switch *, int)' [-Werror=incompatible-pointer-types]
  .get_tag_protocol = felix_get_tag_protocol,
                      ^~~~~~~~~~~~~~~~~~~~~~

for users enabling CONFIG_NET_DSA_MSCC_FELIX.

Fixes: 1f5024aa73fc ("kernel: backport b53/bcm_sf2 changes from v5.6")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
target/linux/layerscape/patches-5.4/702-net-dsa-felix-update-.get_tag_protocol-CB-to-the-cha.patch [new file with mode: 0644]

diff --git a/target/linux/layerscape/patches-5.4/702-net-dsa-felix-update-.get_tag_protocol-CB-to-the-cha.patch b/target/linux/layerscape/patches-5.4/702-net-dsa-felix-update-.get_tag_protocol-CB-to-the-cha.patch
new file mode 100644 (file)
index 0000000..bec2e28
--- /dev/null
@@ -0,0 +1,26 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Tue, 3 Jan 2023 07:19:26 +0000
+Subject: [PATCH] net: dsa: felix: update .get_tag_protocol CB to the changed
+ API
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+(cherry picked from commit 4d776482ecc689bdd68627985ac4cb5a6f325953)
+---
+ drivers/net/dsa/ocelot/felix.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/dsa/ocelot/felix.c
++++ b/drivers/net/dsa/ocelot/felix.c
+@@ -48,7 +48,8 @@ const struct tsn_ops switch_tsn_ops = {
+ #endif
+ static enum dsa_tag_protocol felix_get_tag_protocol(struct dsa_switch *ds,
+-                                                  int port)
++                                                  int port,
++                                                  enum dsa_tag_protocol mp)
+ {
+       return DSA_TAG_PROTO_OCELOT;
+ }