net: dsa: Use conduit and user terms

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

diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index 1fd7fa2..8ed52dd 100644 (file)
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -129,7 +129,7 @@ enum dsa_code {
 static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev,
                                   u8 extra)
 {
-       struct dsa_port *dp = dsa_slave_to_port(dev);
+       struct dsa_port *dp = dsa_user_to_port(dev);
        struct net_device *br_dev;
        u8 tag_dev, tag_port;
        enum dsa_cmd cmd;
@@ -267,14 +267,14 @@ static struct sk_buff *dsa_rcv_ll(struct sk_buff *skb, struct net_device *dev,
                lag = dsa_lag_by_id(cpu_dp->dst, source_port + 1);
                skb->dev = lag ? lag->dev : NULL;
        } else {
-               skb->dev = dsa_master_find_slave(dev, source_device,
+               skb->dev = dsa_conduit_find_user(dev, source_device,
                                                 source_port);
        }
 
        if (!skb->dev)
                return NULL;
 
-       /* When using LAG offload, skb->dev is not a DSA slave interface,
+       /* When using LAG offload, skb->dev is not a DSA user interface,
         * so we cannot call dsa_default_offload_fwd_mark and we need to
         * special-case it.
         */