net: dsa: Use conduit and user terms

[linux-2.6-microblaze.git] / net / dsa / tag_rtl4_a.c

diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c
index c327314..4da5bad 100644 (file)
--- a/net/dsa/tag_rtl4_a.c
+++ b/net/dsa/tag_rtl4_a.c
@@ -36,7 +36,7 @@
 static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb,
                                      struct net_device *dev)
 {
-       struct dsa_port *dp = dsa_slave_to_port(dev);
+       struct dsa_port *dp = dsa_user_to_port(dev);
        __be16 *p;
        u8 *tag;
        u16 out;
@@ -97,9 +97,9 @@ static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb,
        }
        port = protport & 0xff;
 
-       skb->dev = dsa_master_find_slave(dev, 0, port);
+       skb->dev = dsa_conduit_find_user(dev, 0, port);
        if (!skb->dev) {
-               netdev_dbg(dev, "could not find slave for port %d\n", port);
+               netdev_dbg(dev, "could not find user for port %d\n", port);
                return NULL;
        }