diff options
author | David S. Miller <davem@davemloft.net> | 2015-03-29 13:24:05 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-29 13:24:05 -0700 |
commit | 7836b16c0dd1d3039ccc35ceeff6d75401fbba8c (patch) | |
tree | 62f92afc09fc12f37e1048147ea0090e652921c8 /net/netfilter/nft_nat.c | |
parent | 5ce58c2f13eaa8ca6d7e1041175433bd8cc55756 (diff) | |
parent | b2a6b93a0c5730dd96f224ed22ccd0662d06b3b0 (diff) |
Merge branch 'dsa-hw-bridging'
Guenter Roeck says:
====================
net: dsa: HW bridging, EEE support
Patch 1 to 7 of this series prepare the drivers using the mv88e6xxx code
for HW bridging support, without adding the code itself. For the most part
this factors out common port initialization code. There is no functional
change except for patch 3, which disables the message port bit for the
CPU port to prevent packet duplication if HW bridging is configured.
Patch 8 adds the infrastructure for hardware bridging support to the
mv88e6xxx code.
Patch 9 wires the MV88E6352 driver to support hardware bridging.
Patches 10 to 12 add support for ndo_fdb functions to the dsa subsystem,
and wire up the MV88E6352 driver to support those functions.
Patches 13 to 16 add EEE support and HW bridging support to the mv88e6171
driver. This set of patches is from Andrew, applied on top of the first
set of patches.
The series applies to net-next as of 3/24/2015.
Thanks a lot to Andrew Lunn for testing and valuable feedback.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nft_nat.c')
0 files changed, 0 insertions, 0 deletions