kernel: bump 5.15 to 5.15.125

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch

diff --git a/target/linux/generic/backport-5.15/701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch b/target/linux/generic/backport-5.15/701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch
index f682260699dc0d7176b8de78d3db5a84b7159cea..0c50ae6fb9de9e8dc40112a2d886007aafa08106 100644 (file)
--- a/target/linux/generic/backport-5.15/701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch
+++ b/target/linux/generic/backport-5.15/701-v5.17-dsa-make-tagging-protocols-connect-to-individual-switches.patch
@@ -168,14 +168,14 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return err;
 @@ -1315,7 +1314,6 @@ static int dsa_port_parse_cpu(struct dsa
+       struct dsa_switch *ds = dp->ds;
        struct dsa_switch_tree *dst = ds->dst;
-       const struct dsa_device_ops *tag_ops;
        enum dsa_tag_protocol default_proto;
 -      int err;
  
        /* Find out which protocol the switch would prefer. */
        default_proto = dsa_get_tag_protocol(dp, master);
-@@ -1363,12 +1361,6 @@ static int dsa_port_parse_cpu(struct dsa
+@@ -1370,12 +1368,6 @@ static int dsa_port_parse_cpu(struct dsa
                 */
                dsa_tag_driver_put(tag_ops);
        } else {