kernel: bump 5.10 to 5.10.176

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch

diff --git a/target/linux/generic/backport-5.10/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch b/target/linux/generic/backport-5.10/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch
index 8c2aa32ec8e988b206e8cf345f66b8ab222577be..eb60134a1e9b3b63d55da5d00e8c0332aa0fa542 100644 (file)
--- a/target/linux/generic/backport-5.10/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch
+++ b/target/linux/generic/backport-5.10/773-v5.18-1-net-dsa-Move-VLAN-filtering-syncing-out-of-dsa_switc.patch
@@ -22,11 +22,9 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  net/dsa/switch.c | 39 ++++++++++++++++++++++++++-------------
  1 file changed, 26 insertions(+), 13 deletions(-)
 
-diff --git a/net/dsa/switch.c b/net/dsa/switch.c
-index a44035872cff..659fd979cc0a 100644
 --- a/net/dsa/switch.c
 +++ b/net/dsa/switch.c
-@@ -104,23 +104,12 @@ static int dsa_switch_bridge_join(struct dsa_switch *ds,
+@@ -104,23 +104,12 @@ static int dsa_switch_bridge_join(struct
        return 0;
  }
  
@@ -52,7 +50,7 @@ index a44035872cff..659fd979cc0a 100644
        /* If the bridge was vlan_filtering, the bridge core doesn't trigger an
         * event for changing vlan_filtering setting upon slave ports leaving
         * it. That is a good thing, because that lets us handle it and also
-@@ -153,6 +142,30 @@ static int dsa_switch_bridge_leave(struct dsa_switch *ds,
+@@ -153,6 +142,30 @@ static int dsa_switch_bridge_leave(struc
                if (err && err != EOPNOTSUPP)
                        return err;
        }
@@ -83,6 +81,3 @@ index a44035872cff..659fd979cc0a 100644
        return 0;
  }
  
--- 
-2.34.1
-