aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-12-15 06:20:33 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-17 15:10:22 +0100
commita696e325f7a0ee386cd0c433f4bf2e30e9fc4b01 (patch)
tree2db37701195be5e689e0480a6de94fb0fd528d8e /target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch
parent87def9efd8cee66da3bd3961671e580282427c2e (diff)
downloadupstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.tar.gz
upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.tar.bz2
upstream-a696e325f7a0ee386cd0c433f4bf2e30e9fc4b01.zip
kernel: bump 5.4 to 5.4.165
All patches automatically rebased. Build system: x86_64 Build-tested: ramips/mt7621* *FS#4149 affects me so I had to revert 7f1edbd41295dff9f2127b169fbc086c0fb2c14e in order to downgrade to 2.35.1 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch b/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch
index 12a03b0d7b..a37cf66def 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0394-drivers-net-mscc_ocelot-don-t-flood-unicast-traffic-.patch
@@ -15,7 +15,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
-@@ -1680,6 +1680,8 @@ static int ocelot_port_obj_del(struct ne
+@@ -1677,6 +1677,8 @@ static int ocelot_port_obj_del(struct ne
int ocelot_port_bridge_join(struct ocelot *ocelot, int port,
struct net_device *bridge)
{
@@ -24,7 +24,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
if (!ocelot->bridge_mask) {
ocelot->hw_bridge_dev = bridge;
} else {
-@@ -1691,6 +1693,12 @@ int ocelot_port_bridge_join(struct ocelo
+@@ -1688,6 +1690,12 @@ int ocelot_port_bridge_join(struct ocelo
ocelot->bridge_mask |= BIT(port);