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

Commit 6004c867 authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

switchdev: add bridge port flags attr 



rocker: use switchdev get/set attr for bridge port flags

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9228ad26

drivers/net/ethernet/rocker/rocker.c

+25 −0
Original line number Diff line number Diff line
@@ -4394,6 +4394,9 @@ static int rocker_port_attr_get(struct net_device *dev, 
		attr->ppid.id_len = sizeof(rocker->hw.id);

		memcpy(&attr->ppid.id, &rocker->hw.id, attr->ppid.id_len);

		break;

	case SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS:

		attr->brport_flags = rocker_port->brport_flags;

		break;

	default:

		return -EOPNOTSUPP;

	}
@@ -4411,6 +4414,24 @@ static void rocker_port_trans_abort(struct rocker_port *rocker_port) 
	}

}



static int rocker_port_brport_flags_set(struct rocker_port *rocker_port,

					enum switchdev_trans trans,

					unsigned long brport_flags)

{

	unsigned long orig_flags;

	int err = 0;



	orig_flags = rocker_port->brport_flags;

	rocker_port->brport_flags = brport_flags;

	if ((orig_flags ^ rocker_port->brport_flags) & BR_LEARNING)

		err = rocker_port_set_learning(rocker_port, trans);



	if (trans == SWITCHDEV_TRANS_PREPARE)

		rocker_port->brport_flags = orig_flags;



	return err;

}



static int rocker_port_attr_set(struct net_device *dev,

				struct switchdev_attr *attr)

{
@@ -4433,6 +4454,10 @@ static int rocker_port_attr_set(struct net_device *dev, 
		err = rocker_port_stp_update(rocker_port, attr->trans,

					     attr->stp_state);

		break;

	case SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS:

		err = rocker_port_brport_flags_set(rocker_port, attr->trans,

						   attr->brport_flags);

		break;

	default:

		err = -EOPNOTSUPP;

		break;

include/net/switchdev.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ enum switchdev_attr_id { 
	SWITCHDEV_ATTR_UNDEFINED,

	SWITCHDEV_ATTR_PORT_PARENT_ID,

	SWITCHDEV_ATTR_PORT_STP_STATE,

	SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS,

};



struct switchdev_attr {
@@ -36,6 +37,7 @@ struct switchdev_attr { 
	union {

		struct netdev_phys_item_id ppid;	/* PORT_PARENT_ID */

		u8 stp_state;				/* PORT_STP_STATE */

		unsigned long brport_flags;		/* PORT_BRIDGE_FLAGS */

	};

};