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

Commit 610d2b60 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

rocker: Remove getting PORT_BRIDGE_FLAGS 



There is no code that attempts to get the
SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS attribute, remove support for that.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1ecb1957

drivers/net/ethernet/rocker/rocker.h

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ struct rocker_world_ops { 
	int (*port_attr_bridge_flags_set)(struct rocker_port *rocker_port,

					  unsigned long brport_flags,

					  struct switchdev_trans *trans);

	int (*port_attr_bridge_flags_get)(const struct rocker_port *rocker_port,

					  unsigned long *p_brport_flags);

	int (*port_attr_bridge_flags_support_get)(const struct rocker_port *

						  rocker_port,

						  unsigned long *

drivers/net/ethernet/rocker/rocker_main.c

+0 −15
Original line number Diff line number Diff line
@@ -1582,17 +1582,6 @@ rocker_world_port_attr_bridge_flags_set(struct rocker_port *rocker_port, 
						trans);

}



static int

rocker_world_port_attr_bridge_flags_get(const struct rocker_port *rocker_port,

					unsigned long *p_brport_flags)

{

	struct rocker_world_ops *wops = rocker_port->rocker->wops;



	if (!wops->port_attr_bridge_flags_get)

		return -EOPNOTSUPP;

	return wops->port_attr_bridge_flags_get(rocker_port, p_brport_flags);

}



static int

rocker_world_port_attr_bridge_flags_support_get(const struct rocker_port *

						rocker_port,
@@ -2061,10 +2050,6 @@ static int rocker_port_attr_get(struct net_device *dev, 
	int err = 0;



	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS:

		err = rocker_world_port_attr_bridge_flags_get(rocker_port,

							      &attr->u.brport_flags);

		break;

	case SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS_SUPPORT:

		err = rocker_world_port_attr_bridge_flags_support_get(rocker_port,

								      &attr->u.brport_flags_support);

drivers/net/ethernet/rocker/rocker_ofdpa.c

+0 −10
Original line number Diff line number Diff line
@@ -2511,16 +2511,6 @@ static int ofdpa_port_attr_bridge_flags_set(struct rocker_port *rocker_port, 
	return err;

}



static int

ofdpa_port_attr_bridge_flags_get(const struct rocker_port *rocker_port,

				 unsigned long *p_brport_flags)

{

	const struct ofdpa_port *ofdpa_port = rocker_port->wpriv;



	*p_brport_flags = ofdpa_port->brport_flags;

	return 0;

}



static int

ofdpa_port_attr_bridge_flags_support_get(const struct rocker_port *

					 rocker_port,