hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Scott Feldman 2015-05-10 09:47:55 -07:00 committed by David S. Miller
parent 9228ad26ab
commit 6004c86718
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/ethernet/rocker/rocker.c
View File

@ -4394,6 +4394,9 @@ static int rocker_port_attr_get(struct net_device *dev,
attr->ppid.id_len = sizeof(rocker->hw.id); attr->ppid.id_len = sizeof(rocker->hw.id);
memcpy(&attr->ppid.id, &rocker->hw.id, attr->ppid.id_len); memcpy(&attr->ppid.id, &rocker->hw.id, attr->ppid.id_len);
break; break;
case SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS:
attr->brport_flags = rocker_port->brport_flags;
break;
default: default:
return -EOPNOTSUPP; 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, static int rocker_port_attr_set(struct net_device *dev,
struct switchdev_attr *attr) 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, err = rocker_port_stp_update(rocker_port, attr->trans,
attr->stp_state); attr->stp_state);
break; break;
case SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS:
err = rocker_port_brport_flags_set(rocker_port, attr->trans,
attr->brport_flags);
break;
default: default:
err = -EOPNOTSUPP; err = -EOPNOTSUPP;
break; break;

2
include/net/switchdev.h
View File

@ -27,6 +27,7 @@ enum switchdev_attr_id {
SWITCHDEV_ATTR_UNDEFINED, SWITCHDEV_ATTR_UNDEFINED,
SWITCHDEV_ATTR_PORT_PARENT_ID, SWITCHDEV_ATTR_PORT_PARENT_ID,
SWITCHDEV_ATTR_PORT_STP_STATE, SWITCHDEV_ATTR_PORT_STP_STATE,
SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS,
}; };
struct switchdev_attr { struct switchdev_attr {
@ -36,6 +37,7 @@ struct switchdev_attr {
union { union {
struct netdev_phys_item_id ppid; /* PORT_PARENT_ID */ struct netdev_phys_item_id ppid; /* PORT_PARENT_ID */
u8 stp_state; /* PORT_STP_STATE */ u8 stp_state; /* PORT_STP_STATE */
unsigned long brport_flags; /* PORT_BRIDGE_FLAGS */
}; };
}; };