tree 13af15cfc561b76a863e585f732fba756c29c236
parent ed52f2c608c9451fa2bad298b2ab927416105d65
parent 8b3abe304c5f1057b7bac70fd5576dfa67e3e2b3
author David S. Miller <davem@davemloft.net> 1585623342 -0700
committer David S. Miller <davem@davemloft.net> 1585623342 -0700

Merge branch 'net-dsa-b53-and-bcm_sf2-updates-for-7278'

Florian Fainelli says:

====================
net: dsa: b53 & bcm_sf2 updates for 7278

This patch series contains some updates to the b53 and bcm_sf2 drivers
specifically for the 7278 Ethernet switch.

The first patch is technically a bug fix so it should ideally be
backported to -stable, provided that Dan also agress with my resolution
on this.

Patches #2 through #4 are minor changes to the core b53 driver to
restore VLAN configuration upon system resumption as well as deny
specific bridge/VLAN operations on port 7 with the 7278 which is special
and does not support VLANs.

Patches #5 through #9 add support for matching VLAN TCI keys/masks to
the CFP code.

Changes in v2:

- fixed some code comments and arrange some code for easier reading
====================

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