diff options
author | David S. Miller <davem@davemloft.net> | 2016-05-09 14:26:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-09 14:26:14 -0400 |
commit | e26522cd0b63fdbf3b4e9a39d73a985cc9b4fe27 (patch) | |
tree | 917a670ad6b4d142987abcb2ac932a7a59e3f412 /net/openvswitch/conntrack.c | |
parent | 908578e7d5f69087241434c872f8f4a8ab70045f (diff) | |
parent | f81ec90fe9cbf512f3c632130a37c6d353fa94ea (diff) | |
download | linux-e26522cd0b63fdbf3b4e9a39d73a985cc9b4fe27.tar.bz2 |
Merge branch 'dsa-mv88e6xxx-monolithic'
Vivien Didelot says:
====================
net: dsa: mv88e6xxx: turn into monolithic driver
This patchset merges all mv88e6* drivers supported by the shared
mv88e6xxx code into a single mv88e6xxx DSA switch driver.
Some flags are added to describe the capabilities of a switch model,
such as the presence of a PPU, EEPROM, some old or new registers, etc.
First these flags are used to conditionally support the same set of
functions in every driver, then specific driver files are removed in
favor of the common mv88e6xxx driver.
Only the merge of driver specific setup code assumes a few differences.
If these differences such as frames priorities are really needed for
some models, they can easily be brought back in a future patch.
Some inconsistencies might show up, such as the need for
MV88E6XXX_FLAG_PPU and MV88E6XXX_FLAG_PPU_ACTIVE flags. But this
patchset does not aim to fix them yet. A future patch can do that if
they end up being unwanted.
The patchset has been tested on interconnected 88E6352 and 88E6185.
Changes v1 -> v2:
- add missing MV88E6XXX_FLAG_EEPROM flag checks
- remove a few remaining _ prefixes
- remove MV88E6XXX_FLAG_CORE_TAG_TYPE which is a specific default
Changes RFC -> v1:
- introduce flags in a separate patch
- do not refactor anything yet
- do not add new functions prefixed with _
- drop packet discarding and mentioned tested platforms
- factorize family flags
- update text for NET_DSA_MV88E6XXX Kconfig entry
====================
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/conntrack.c')
0 files changed, 0 insertions, 0 deletions