Merge branch 'bridge-mrp'
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2021 00:20:58 +0000 (16:20 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Feb 2021 00:20:58 +0000 (16:20 -0800)
commit6bbc088d6ebfd5a4284641dbe8413ebab0dfeb8c
tree3e51cc659f77932742a2c749a2d9da441806cfb2
parent3aa6bce9af0e25b735c9c1263739a5639a336ae8
parent059d2a1004981dce19f0127dabc1b4ec927d202a
Merge branch 'bridge-mrp'

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>