Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2231c43b authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

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: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0006b00

net/dsa/dsa_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 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,

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;

net/dsa/tag_brcm.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/dsa/tag_dsa.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/dsa/tag_edsa.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/dsa/tag_ksz.c

+1 −1
Original line number Diff line number Diff line
@@ -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;