diff options
| author | INAGAKI Hiroshi <musashino.open@gmail.com> | 2021-05-07 00:38:22 +0900 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-09-26 00:32:18 +0200 |
| commit | a22602728c02e380ef4496b833271d5c760fe46f (patch) | |
| tree | fbd2ccf89090b2a5234404a55f4d90f1afc57d1d | |
| parent | 9a4b8d6c306cef4dcdb442d541aaff6e3761da53 (diff) | |
| download | upstream-a22602728c02e380ef4496b833271d5c760fe46f.tar.gz upstream-a22602728c02e380ef4496b833271d5c760fe46f.tar.bz2 upstream-a22602728c02e380ef4496b833271d5c760fe46f.zip | |
realtek: fix compile errors in dsa driver for 5.10
this patch fixes the following errors when compiling:
- dsa_switch_alloc is removed[1]
- a parameter "enum dsa_tag_protocol mprot" is added to dsa_tag_protocol
in dsa_switch_ops (include/net/dsa.h)
- several paramters are added to "phylink_mac_link_up" in dsa_switch_ops
(include/net/dsa.h)
added:
- int speed
- int duplex
- bool tx_pause
- bool rx_pause
- a parameter "struct switchdev_trans *trans" is added to
port_vlan_filtering in dsa_switch_ops (include/net/dsa.h)
[1]: https://lore.kernel.org/lkml/20191020031941.3805884-17-vivien.didelot@gmail.com/
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
| -rw-r--r-- | target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/common.c | 2 | ||||
| -rw-r--r-- | target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/common.c index a380906b92..ad69debcc8 100644 --- a/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/common.c +++ b/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/common.c @@ -546,7 +546,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; - priv->ds = dsa_switch_alloc(dev, DSA_MAX_PORTS); + priv->ds = devm_kzalloc(dev, sizeof(*priv->ds), GFP_KERNEL); if (!priv->ds) return -ENOMEM; diff --git a/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c b/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c index c2a230c4cb..6c0ed5ae00 100644 --- a/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c +++ b/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/dsa.c @@ -101,7 +101,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. @@ -474,7 +476,9 @@ static void rtl83xx_phylink_mac_link_down(struct dsa_switch *ds, int port, static void rtl83xx_phylink_mac_link_up(struct dsa_switch *ds, int port, unsigned int mode, phy_interface_t interface, - struct phy_device *phydev) + struct phy_device *phydev, + int speed, int duplex, + bool tx_pause, bool rx_pause) { struct rtl838x_switch_priv *priv = ds->priv; /* Restart TX/RX to port */ @@ -824,7 +828,8 @@ void rtl930x_fast_age(struct dsa_switch *ds, int port) } static int rtl83xx_vlan_filtering(struct dsa_switch *ds, int port, - bool vlan_filtering) + bool vlan_filtering, + struct switchdev_trans *trans) { struct rtl838x_switch_priv *priv = ds->priv; |