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

Commit 3775b1b7 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: add master helper to look up slaves 



The DSA tagging code does not need to know about the DSA architecture,
it only needs to return the slave device corresponding to the source
port index (and eventually the source device index for cascade-capable
switches) parsed from the frame received on the master device.

For this purpose, provide an inline dsa_master_get_slave helper which
validates the device and port indexes and look up the slave device.

This makes the tagging rcv functions more concise and robust, and also
makes dsa_get_cpu_port obsolete.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 075cfdd6

net/dsa/dsa_priv.h

+19 −5
Original line number Diff line number Diff line
@@ -113,6 +113,25 @@ 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)

{

	struct dsa_switch_tree *dst = dev->dsa_ptr;

	struct dsa_switch *ds;



	if (device < 0 || device >= DSA_MAX_SWITCHES)

		return NULL;



	ds = dst->ds[device];

	if (!ds)

		return NULL;



	if (port < 0 || port >= ds->num_ports)

		return NULL;



	return ds->ports[port].netdev;

}



/* port.c */

int dsa_port_set_state(struct dsa_port *dp, u8 state,

		       struct switchdev_trans *trans);
@@ -182,9 +201,4 @@ static inline struct net_device *dsa_master_netdev(struct dsa_slave_priv *p) 
	return p->dp->cpu_dp->netdev;

}



static inline struct dsa_port *dsa_get_cpu_port(struct dsa_switch_tree *dst)

{

	return dst->cpu_dp;

}



#endif

net/dsa/tag_brcm.c

+2 −7
Original line number Diff line number Diff line
@@ -92,9 +92,6 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, struct net_device *dev 
static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,

				    struct packet_type *pt)

{

	struct dsa_switch_tree *dst = dev->dsa_ptr;

	struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);

	struct dsa_switch *ds = cpu_dp->ds;

	int source_port;

	u8 *brcm_tag;
@@ -117,8 +114,8 @@ 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;



	/* Validate port against switch setup, either the port is totally */

	if (source_port >= ds->num_ports || !ds->ports[source_port].netdev)

	skb->dev = dsa_master_get_slave(dev, 0, source_port);

	if (!skb->dev)

		return NULL;



	/* Remove Broadcom tag and update checksum */
@@ -129,8 +126,6 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev, 
		skb->data - ETH_HLEN - BRCM_TAG_LEN,

		2 * ETH_ALEN);



	skb->dev = ds->ports[source_port].netdev;



	return skb;

}

net/dsa/tag_dsa.c

+2 −16
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev) 
static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,

			       struct packet_type *pt)

{

	struct dsa_switch_tree *dst = dev->dsa_ptr;

	struct dsa_switch *ds;

	u8 *dsa_header;

	int source_device;

	int source_port;
@@ -93,18 +91,8 @@ 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;



	/*

	 * Check that the source device exists and that the source

	 * port is a registered DSA port.

	 */

	if (source_device >= DSA_MAX_SWITCHES)

		return NULL;



	ds = dst->ds[source_device];

	if (!ds)

		return NULL;



	if (source_port >= ds->num_ports || !ds->ports[source_port].netdev)

	skb->dev = dsa_master_get_slave(dev, source_device, source_port);

	if (!skb->dev)

		return NULL;



	/*
@@ -153,8 +141,6 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev, 
			2 * ETH_ALEN);

	}



	skb->dev = ds->ports[source_port].netdev;



	return skb;

}

net/dsa/tag_edsa.c

+2 −16
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev) 
static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,

				struct packet_type *pt)

{

	struct dsa_switch_tree *dst = dev->dsa_ptr;

	struct dsa_switch *ds;

	u8 *edsa_header;

	int source_device;

	int source_port;
@@ -106,18 +104,8 @@ 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;



	/*

	 * Check that the source device exists and that the source

	 * port is a registered DSA port.

	 */

	if (source_device >= DSA_MAX_SWITCHES)

		return NULL;



	ds = dst->ds[source_device];

	if (!ds)

		return NULL;



	if (source_port >= ds->num_ports || !ds->ports[source_port].netdev)

	skb->dev = dsa_master_get_slave(dev, source_device, source_port);

	if (!skb->dev)

		return NULL;



	/*
@@ -172,8 +160,6 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev, 
			2 * ETH_ALEN);

	}



	skb->dev = ds->ports[source_port].netdev;



	return skb;

}

net/dsa/tag_ksz.c

+3 −6
Original line number Diff line number Diff line
@@ -80,22 +80,19 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev) 
static struct sk_buff *ksz_rcv(struct sk_buff *skb, struct net_device *dev,

			       struct packet_type *pt)

{

	struct dsa_switch_tree *dst = dev->dsa_ptr;

	struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);

	struct dsa_switch *ds = cpu_dp->ds;

	u8 *tag;

	int source_port;



	tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;



	source_port = tag[0] & 7;

	if (source_port >= ds->num_ports || !ds->ports[source_port].netdev)



	skb->dev = dsa_master_get_slave(dev, 0, source_port);

	if (!skb->dev)

		return NULL;



	pskb_trim_rcsum(skb, skb->len - KSZ_EGRESS_TAG_LEN);



	skb->dev = ds->ports[source_port].netdev;



	return skb;

}