From f5646ae0b903028c980d385273bcea6e6703685c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 2 Jan 2023 17:26:56 +0100 Subject: [PATCH] realtek: update rtl83xx switch driver to the updated DSA API MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes: CC drivers/net/dsa/rtl83xx/dsa.o drivers/net/dsa/rtl83xx/dsa.c:1274: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 = rtl83xx_get_tag_protocol, ^~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/dsa/rtl83xx/dsa.c:1274:22: note: (near initialization for 'rtl83xx_switch_ops.get_tag_protocol') drivers/net/dsa/rtl83xx/dsa.c:1316: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 = rtl83xx_get_tag_protocol, ^~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 1f5024aa73fc ("kernel: backport b53/bcm_sf2 changes from v5.6") Signed-off-by: Rafał Miłecki --- target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c index 987b47dc8f..ed71c9ce44 100644 --- a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c +++ b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c @@ -145,7 +145,9 @@ const struct rtl83xx_mib_desc rtl83xx_mib[] = { /* DSA callbacks */ -static enum dsa_tag_protocol rtl83xx_get_tag_protocol(struct dsa_switch *ds, int port) +static enum dsa_tag_protocol rtl83xx_get_tag_protocol(struct dsa_switch *ds, + int port, + enum dsa_tag_protocol mprot) { /* The switch does not tag the frames, instead internally the header * structure for each packet is tagged accordingly. -- 2.30.2