Merge branch 'bridge-mrp'

Browse source

Horatiu Vultur says:

====================
bridge: mrp: Fix br_mrp_port_switchdev_set_state

Based on the discussion here[1], there was a problem with the function
br_mrp_port_switchdev_set_state. The problem was that it was called
both with BR_STATE* and BR_MRP_PORT_STATE* types. This patch series
fixes this issue and removes SWITCHDEV_ATTR_ID_MRP_PORT_STAT because
is not used anymore.

[1] https://www.spinics.net/lists/netdev/msg714816.html
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2021-02-08 16:20:58 -08:00

parent 3aa6bce9af 059d2a1004

commit 6bbc088d6e

4 changed files with 10 additions and 11 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/net/switchdev.h

View file

9

net/bridge/br_mrp.c

View file

7

net/bridge/br_mrp_switchdev.c

View file

3

net/bridge/br_private_mrp.h

View file