Commit 6a43cba3 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

net: dsa: export bridging offload helpers to drivers 



Move the static inline helpers from net/dsa/dsa_priv.h to
include/net/dsa.h, so that drivers can call functions such as
dsa_port_offloads_bridge_dev(), which will be necessary after the
transition to a more complex bridge structure.

More functions than are needed right now are being moved, but this is
done for uniformity.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 936db8a2

include/net/dsa.h

+43 −0
Original line number Diff line number Diff line
@@ -620,6 +620,49 @@ static inline bool dsa_port_bridge_same(const struct dsa_port *a, 
	return (!br_a || !br_b) ? false : (br_a == br_b);

}



static inline bool dsa_port_offloads_bridge_port(struct dsa_port *dp,

						 const struct net_device *dev)

{

	return dsa_port_to_bridge_port(dp) == dev;

}



static inline bool

dsa_port_offloads_bridge_dev(struct dsa_port *dp,

			     const struct net_device *bridge_dev)

{

	/* DSA ports connected to a bridge, and event was emitted

	 * for the bridge.

	 */

	return dsa_port_bridge_dev_get(dp) == bridge_dev;

}



/* Returns true if any port of this tree offloads the given net_device */

static inline bool dsa_tree_offloads_bridge_port(struct dsa_switch_tree *dst,

						 const struct net_device *dev)

{

	struct dsa_port *dp;



	list_for_each_entry(dp, &dst->ports, list)

		if (dsa_port_offloads_bridge_port(dp, dev))

			return true;



	return false;

}



/* Returns true if any port of this tree offloads the given bridge */

static inline bool

dsa_tree_offloads_bridge_dev(struct dsa_switch_tree *dst,

			     const struct net_device *bridge_dev)

{

	struct dsa_port *dp;



	list_for_each_entry(dp, &dst->ports, list)

		if (dsa_port_offloads_bridge_dev(dp, bridge_dev))

			return true;



	return false;

}



typedef int dsa_fdb_dump_cb_t(const unsigned char *addr, u16 vid,

			      bool is_static, void *data);

struct dsa_switch_ops {

net/dsa/dsa_priv.h

+0 −43
Original line number Diff line number Diff line
@@ -266,49 +266,6 @@ void dsa_port_hsr_leave(struct dsa_port *dp, struct net_device *hsr); 
int dsa_port_tag_8021q_vlan_add(struct dsa_port *dp, u16 vid, bool broadcast);

void dsa_port_tag_8021q_vlan_del(struct dsa_port *dp, u16 vid, bool broadcast);



static inline bool dsa_port_offloads_bridge_port(struct dsa_port *dp,

						 const struct net_device *dev)

{

	return dsa_port_to_bridge_port(dp) == dev;

}



static inline bool

dsa_port_offloads_bridge_dev(struct dsa_port *dp,

			     const struct net_device *bridge_dev)

{

	/* DSA ports connected to a bridge, and event was emitted

	 * for the bridge.

	 */

	return dsa_port_bridge_dev_get(dp) == bridge_dev;

}



/* Returns true if any port of this tree offloads the given net_device */

static inline bool dsa_tree_offloads_bridge_port(struct dsa_switch_tree *dst,

						 const struct net_device *dev)

{

	struct dsa_port *dp;



	list_for_each_entry(dp, &dst->ports, list)

		if (dsa_port_offloads_bridge_port(dp, dev))

			return true;



	return false;

}



/* Returns true if any port of this tree offloads the given bridge */

static inline bool

dsa_tree_offloads_bridge_dev(struct dsa_switch_tree *dst,

			     const struct net_device *bridge_dev)

{

	struct dsa_port *dp;



	list_for_each_entry(dp, &dst->ports, list)

		if (dsa_port_offloads_bridge_dev(dp, bridge_dev))

			return true;



	return false;

}



/* slave.c */

extern const struct dsa_device_ops notag_netdev_ops;

extern struct notifier_block dsa_slave_switchdev_notifier;