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

Commit 38dcf357 authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

bridge: call netdev_sw_port_stp_update when bridge port STP status changes 



To notify switch driver of change in STP state of bridge port, add new
.ndo op and provide switchdev wrapper func to call ndo op. Use it in bridge
code then.

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarAndy Gospodarek <gospo@cumulusnetworks.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aecbe01e

include/linux/netdevice.h

+5 −0
Original line number Diff line number Diff line
@@ -1024,6 +1024,9 @@ typedef u16 (*select_queue_fallback_t)(struct net_device *dev, 
 *	Called to get an ID of the switch chip this port is part of.

 *	If driver implements this, it indicates that it represents a port

 *	of a switch chip.

 * int (*ndo_switch_port_stp_update)(struct net_device *dev, u8 state);

 *	Called to notify switch device port of bridge port STP

 *	state change.

 */

struct net_device_ops {

	int			(*ndo_init)(struct net_device *dev);
@@ -1180,6 +1183,8 @@ struct net_device_ops { 
#ifdef CONFIG_NET_SWITCHDEV

	int			(*ndo_switch_parent_id_get)(struct net_device *dev,

							    struct netdev_phys_item_id *psid);

	int			(*ndo_switch_port_stp_update)(struct net_device *dev,

							      u8 state);

#endif

};

include/net/switchdev.h

+7 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


int netdev_switch_parent_id_get(struct net_device *dev,

				struct netdev_phys_item_id *psid);

int netdev_switch_port_stp_update(struct net_device *dev, u8 state);



#else
@@ -25,6 +26,12 @@ static inline int netdev_switch_parent_id_get(struct net_device *dev, 
	return -EOPNOTSUPP;

}



static inline int netdev_switch_port_stp_update(struct net_device *dev,

						u8 state)

{

	return -EOPNOTSUPP;

}



#endif



#endif /* _LINUX_SWITCHDEV_H_ */

net/bridge/br_stp.c

+7 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */

#include <linux/kernel.h>

#include <linux/rculist.h>

#include <net/switchdev.h>



#include "br_private.h"

#include "br_private_stp.h"
@@ -38,7 +39,13 @@ void br_log_state(const struct net_bridge_port *p) 


void br_set_state(struct net_bridge_port *p, unsigned int state)

{

	int err;



	p->state = state;

	err = netdev_switch_port_stp_update(p->dev, state);

	if (err && err != -EOPNOTSUPP)

		br_warn(p->br, "error setting offload STP state on port %u(%s)\n",

				(unsigned int) p->port_no, p->dev->name);

}



/* called under bridge lock */

net/switchdev/switchdev.c

+19 −0
Original line number Diff line number Diff line
@@ -31,3 +31,22 @@ int netdev_switch_parent_id_get(struct net_device *dev, 
	return ops->ndo_switch_parent_id_get(dev, psid);

}

EXPORT_SYMBOL(netdev_switch_parent_id_get);



/**

 *	netdev_switch_port_stp_update - Notify switch device port of STP

 *					state change

 *	@dev: port device

 *	@state: port STP state

 *

 *	Notify switch device port of bridge port STP state change.

 */

int netdev_switch_port_stp_update(struct net_device *dev, u8 state)

{

	const struct net_device_ops *ops = dev->netdev_ops;



	if (!ops->ndo_switch_port_stp_update)

		return -EOPNOTSUPP;

	WARN_ON(!ops->ndo_switch_parent_id_get);

	return ops->ndo_switch_port_stp_update(dev, state);

}

EXPORT_SYMBOL(netdev_switch_port_stp_update);