diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-30 12:27:07 +0900 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-30 12:27:07 +0900 |
| commit | ee6259382ca8f723a2cc90841f903667c7720584 (patch) | |
| tree | ed2056da6e611196798f979b9331b9f1d97fd74f /net/switchdev/switchdev.c | |
| parent | 65bdc43d2220bc97af037c87aba2407b46f13c2a (diff) | |
| parent | c7070fc4ecb50bee801cef85483e043d0ba1dd27 (diff) | |
Merge branch 'mlxsw-flooding-and-cosmetics'
Jiri Pirko says:
====================
mlxsw: driver update
This driver update mainly brings support for user to be able to setup
flooding on specified port, via bridge flag. Also, there is a fix in ageing
time conversion. The rest is just cosmetics.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/switchdev/switchdev.c')
| -rw-r--r-- | net/switchdev/switchdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 1eb76956b439..8950d39af341 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -746,7 +746,7 @@ int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, .id = SWITCHDEV_ATTR_ID_PORT_BRIDGE_FLAGS, }; u16 mode = BRIDGE_MODE_UNDEF; - u32 mask = BR_LEARNING | BR_LEARNING_SYNC; + u32 mask = BR_LEARNING | BR_LEARNING_SYNC | BR_FLOOD; int err; err = switchdev_port_attr_get(dev, &attr); @@ -817,6 +817,9 @@ static int switchdev_port_br_setlink_protinfo(struct net_device *dev, err = switchdev_port_br_setflag(dev, attr, BR_LEARNING_SYNC); break; + case IFLA_BRPORT_UNICAST_FLOOD: + err = switchdev_port_br_setflag(dev, attr, BR_FLOOD); + break; default: err = -EOPNOTSUPP; break; |