summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/rocker
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2015-05-10 09:47:55 -0700
committerDavid S. Miller <davem@davemloft.net>2015-05-12 18:43:54 -0400
commit6004c86718998aee1337efd3b087d6e17284632d (patch)
tree1f046bd21d9583618ed312115fb0c0aef1f273c9 /drivers/net/ethernet/rocker
parent9228ad26abeec99caf139e6d641e0199c95fd677 (diff)
downloadop-kernel-dev-6004c86718998aee1337efd3b087d6e17284632d.zip
op-kernel-dev-6004c86718998aee1337efd3b087d6e17284632d.tar.gz
switchdev: add bridge port flags attr
rocker: use switchdev get/set attr for bridge port flags Signed-off-by: Scott Feldman <sfeldma@gmail.com> Acked-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rocker')
-rw-r--r--drivers/net/ethernet/rocker/rocker.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index 8408480..ceb6a64 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -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;
OpenPOWER on IntegriCloud