Merge branch 'bridge-mrp-next'

Browse source

Horatiu Vultur says:

====================
bridge: mrp: Disable roles before deleting

The first patch in this series make sures that the driver is notified
that the role is disabled before the MRP instance is deleted. The
second patch uses this so it can simplify the driver.
====================

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

...

This commit is contained in:

David S. Miller 2021-03-24 12:14:08 -07:00

parent 45b85e47cd 5b7c0c32c9

commit bb11d9ac9d

2 changed files with 7 additions and 16 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

16

drivers/net/ethernet/mscc/ocelot_mrp.c

View file

7

net/bridge/br_mrp.c

View file