net: dsa: Use conduit and user terms

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

diff --git a/net/dsa/tag_gswip.c b/net/dsa/tag_gswip.c
index e279cd9..3539141 100644 (file)
--- a/net/dsa/tag_gswip.c
+++ b/net/dsa/tag_gswip.c
@@ -61,7 +61,7 @@
 static struct sk_buff *gswip_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);
        u8 *gswip_tag;
 
        skb_push(skb, GSWIP_TX_HEADER_LEN);
@@ -89,7 +89,7 @@ static struct sk_buff *gswip_tag_rcv(struct sk_buff *skb,
 
        /* Get source port information */
        port = (gswip_tag[7] & GSWIP_RX_SPPID_MASK) >> GSWIP_RX_SPPID_SHIFT;
-       skb->dev = dsa_master_find_slave(dev, 0, port);
+       skb->dev = dsa_conduit_find_user(dev, 0, port);
        if (!skb->dev)
                return NULL;