kernel: 5.15: update Aquantia PHY driver to v6.1 code

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch

diff --git a/target/linux/generic/backport-5.15/700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch b/target/linux/generic/backport-5.15/700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch
index fe47c175a4a55d63602974d21633a5fea225a2c6..f56a968589569154a594ada1809a72d12f7738b6 100644 (file)
--- a/target/linux/generic/backport-5.15/700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch
+++ b/target/linux/generic/backport-5.15/700-v5.17-net-dsa-introduce-tagger-owned-storage-for-private.patch
@@ -94,7 +94,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        /*
         * Configuration data for this switch.
         */
-@@ -584,6 +589,13 @@ struct dsa_switch_ops {
+@@ -612,6 +617,13 @@ struct dsa_switch_ops {
                                                  enum dsa_tag_protocol mprot);
        int     (*change_tag_protocol)(struct dsa_switch *ds, int port,
                                       enum dsa_tag_protocol proto);
@@ -217,14 +217,14 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        rtnl_unlock();
  
 @@ -1257,6 +1315,7 @@ 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);
-@@ -1304,6 +1363,12 @@ static int dsa_port_parse_cpu(struct dsa
+@@ -1311,6 +1370,12 @@ static int dsa_port_parse_cpu(struct dsa
                 */
                dsa_tag_driver_put(tag_ops);
        } else {