diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2023-01-02 17:26:56 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2023-01-02 17:43:31 +0100 |
| commit | f5646ae0b903028c980d385273bcea6e6703685c (patch) | |
| tree | b8a80e34504b240693f65611d1ec636f6b4cc93c | |
| parent | 76c9c2b113a8d372b4b4c1a5ccc941fb895dbdf5 (diff) | |
| download | upstream-f5646ae0b903028c980d385273bcea6e6703685c.tar.gz upstream-f5646ae0b903028c980d385273bcea6e6703685c.tar.bz2 upstream-f5646ae0b903028c980d385273bcea6e6703685c.zip | |
realtek: update rtl83xx switch driver to the updated DSA API
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 <rafal@milecki.pl>
| -rw-r--r-- | target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c | 4 |
1 files changed, 3 insertions, 1 deletions
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. |