net: dsa: rename dsa_master_get_slave

The dsa_master_get_slave is slightly confusing since the idiomatic "get"
term often suggests reference counting, in symmetry to "put".

Rename it to dsa_master_find_slave to make the look up operation clear.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index eedda1f1b09929815de3ad5d516be3e83b1602bc..623c22b75e81457252310a99911b27165ad707fb 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -113,8 +113,8 @@ int dsa_legacy_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
 int dsa_master_ethtool_setup(struct net_device *dev);
 void dsa_master_ethtool_restore(struct net_device *dev);
 
-static inline struct net_device *dsa_master_get_slave(struct net_device *dev,
-                                                     int device, int port)
+static inline struct net_device *dsa_master_find_slave(struct net_device *dev,
+                                                      int device, int port)
 {
        struct dsa_port *cpu_dp = dev->dsa_ptr;
        struct dsa_switch_tree *dst = cpu_dp->dst;

diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
index 2a0fa9f9f7ca8ca27e51362deb17c54d64f8ef6c..9e082bae3cb0c00b319f47208e180ab1f2a6ce04 100644 (file)
--- a/net/dsa/tag_brcm.c
+++ b/net/dsa/tag_brcm.c
@@ -119,7 +119,7 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,
        /* Locate which port this is coming from */
        source_port = brcm_tag[3] & BRCM_EG_PID_MASK;
 
-       skb->dev = dsa_master_get_slave(dev, 0, source_port);
+       skb->dev = dsa_master_find_slave(dev, 0, source_port);
        if (!skb->dev)
                return NULL;
 

diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
index fe3c9700a8c849211a2f16cd801c3bbefad0ac0f..dbbcdafed8c30cfad64e6eb8ae19169eed224599 100644 (file)
--- a/net/dsa/tag_dsa.c
+++ b/net/dsa/tag_dsa.c
@@ -91,7 +91,7 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,
        source_device = dsa_header[0] & 0x1f;
        source_port = (dsa_header[1] >> 3) & 0x1f;
 
-       skb->dev = dsa_master_get_slave(dev, source_device, source_port);
+       skb->dev = dsa_master_find_slave(dev, source_device, source_port);
        if (!skb->dev)
                return NULL;
 

diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index c683e240bafcfb0a3d90dc7c6fea09b004d475c7..f38a626b3a0554e5b5316f167e944ba7389139d8 100644 (file)
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -104,7 +104,7 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,
        source_device = edsa_header[0] & 0x1f;
        source_port = (edsa_header[1] >> 3) & 0x1f;
 
-       skb->dev = dsa_master_get_slave(dev, source_device, source_port);
+       skb->dev = dsa_master_find_slave(dev, source_device, source_port);
        if (!skb->dev)
                return NULL;
 

diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index 66e443fd76757315aa5171daa7fdcc268d0e238d..0f62effad88f5e4bdbf79abd215cba8ba405bcb1 100644 (file)
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -87,7 +87,7 @@ static struct sk_buff *ksz_rcv(struct sk_buff *skb, struct net_device *dev,
 
        source_port = tag[0] & 7;
 
-       skb->dev = dsa_master_get_slave(dev, 0, source_port);
+       skb->dev = dsa_master_find_slave(dev, 0, source_port);
        if (!skb->dev)
                return NULL;
 

diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c
index c709adb5efd970b507bec402a4e83277feae72b9..57519597c6fc76e8a958bd0e0397cbd020a01816 100644 (file)
--- a/net/dsa/tag_lan9303.c
+++ b/net/dsa/tag_lan9303.c
@@ -94,7 +94,7 @@ static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,
 
        source_port = ntohs(lan9303_tag[1]) & 0x3;
 
-       skb->dev = dsa_master_get_slave(dev, 0, source_port);
+       skb->dev = dsa_master_find_slave(dev, 0, source_port);
        if (!skb->dev) {
                dev_warn_ratelimited(&dev->dev, "Dropping packet due to invalid source port\n");
                return NULL;

diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c
index 5abebbfd706079c33b2b2c6a3ddeee0562309c51..8475434af7d5886fcec4219bfcc4d0339127ce59 100644 (file)
--- a/net/dsa/tag_mtk.c
+++ b/net/dsa/tag_mtk.c
@@ -69,7 +69,7 @@ static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
        /* Get source port information */
        port = (hdr & MTK_HDR_RECV_SOURCE_PORT_MASK);
 
-       skb->dev = dsa_master_get_slave(dev, 0, port);
+       skb->dev = dsa_master_find_slave(dev, 0, port);
        if (!skb->dev)
                return NULL;
 

diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
index b0274b6781cb0015157e157f5975c395c7c50d5f..613f4ee97771629c5bd46951e9fe2ab6b1297fe5 100644 (file)
--- a/net/dsa/tag_qca.c
+++ b/net/dsa/tag_qca.c
@@ -91,7 +91,7 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
        /* Get source port information */
        port = (hdr & QCA_HDR_RECV_SOURCE_PORT_MASK);
 
-       skb->dev = dsa_master_get_slave(dev, 0, port);
+       skb->dev = dsa_master_find_slave(dev, 0, port);
        if (!skb->dev)
                return NULL;
 

diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c
index 8b205bb5f52111ea658d0cdf290d84adeb6cf009..7d20e1f3de28a4826a9e39667a2a7a1a931cbb2b 100644 (file)
--- a/net/dsa/tag_trailer.c
+++ b/net/dsa/tag_trailer.c
@@ -71,7 +71,7 @@ static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,
 
        source_port = trailer[1] & 7;
 
-       skb->dev = dsa_master_get_slave(dev, 0, source_port);
+       skb->dev = dsa_master_find_slave(dev, 0, source_port);
        if (!skb->dev)
                return NULL;