We have drivers for both rtl8365mb and rtl8366rb and each uses a
different tagger. realtek-dsa didn't know that and caused a reference to
an unavailable symbol when one of them was disabled. Add IS_ENABLED()
guards to fix this.
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
drivers/net/realtek-dsa/tagger.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/net/realtek-dsa/tagger.c b/drivers/net/realtek-dsa/tagger.c
index 1d4461aebcb8..3a41f3b3c1b4 100644
--- a/drivers/net/realtek-dsa/tagger.c
+++ b/drivers/net/realtek-dsa/tagger.c
@@ -4,7 +4,7 @@
int realtek_dsa_init_tagger(struct realtek_priv *priv)
{
- const struct dsa_device_ops *tagger_ops;
+ const struct dsa_device_ops *tagger_ops = NULL;
struct dsa_switch_ops *ops;
/* TODO: Tagging can be configured per port in Linux. barebox DSA core
@@ -14,18 +14,24 @@ int realtek_dsa_init_tagger(struct realtek_priv *priv)
*/
switch (priv->ops->get_tag_protocol(priv)) {
case DSA_TAG_PROTO_RTL4_A:
- tagger_ops = &rtl4a_netdev_ops;
+ if (IS_ENABLED(CONFIG_NET_DSA_TAG_RTL4_A))
+ tagger_ops = &rtl4a_netdev_ops;
break;
case DSA_TAG_PROTO_RTL8_4:
- tagger_ops = &rtl8_4_netdev_ops;
+ if (IS_ENABLED(CONFIG_NET_DSA_TAG_RTL8_4))
+ tagger_ops = &rtl8_4_netdev_ops;
break;
case DSA_TAG_PROTO_RTL8_4T:
- tagger_ops = &rtl8_4t_netdev_ops;
+ if (IS_ENABLED(CONFIG_NET_DSA_TAG_RTL8_4))
+ tagger_ops = &rtl8_4t_netdev_ops;
break;
default:
- return -EINVAL;
+ break;
}
+ if (!tagger_ops)
+ return -EINVAL;
+
ops = memdup(priv->ds->ops, sizeof(*priv->ds->ops));
ops->xmit = tagger_ops->xmit;
ops->rcv = tagger_ops->rcv;
--
2.30.2
