kernel: bump 5.15 to 5.15.54

[openwrt/staging/hauke.git] / target / linux / generic / backport-5.15 / 754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch

diff --git a/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch b/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch
index 408a59df85d49c477c4b9f8388cfff71a0bcb0b9..2cea88089dbba58b2a777a0ba97471f8e05e030a 100644 (file)
--- a/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch
+++ b/target/linux/generic/backport-5.15/754-net-next-net-dsa-qca8k-convert-to-GENMASK_FIELD_PREP_FIELD_GET.patch
@@ -218,7 +218,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                          mask);
        }
  
-@@ -1916,11 +1911,11 @@ qca8k_port_vlan_filtering(struct dsa_swi
+@@ -1935,11 +1930,11 @@ qca8k_port_vlan_filtering(struct dsa_swi
  
        if (vlan_filtering) {
                ret = qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(port),
@@ -232,7 +232,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                                QCA8K_PORT_LOOKUP_VLAN_MODE_NONE);
        }
  
-@@ -1944,10 +1939,9 @@ qca8k_port_vlan_add(struct dsa_switch *d
+@@ -1963,10 +1958,9 @@ qca8k_port_vlan_add(struct dsa_switch *d
        }
  
        if (pvid) {
@@ -245,7 +245,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                if (ret)
                        return ret;
  
-@@ -2041,7 +2035,7 @@ static int qca8k_read_switch_id(struct q
+@@ -2060,7 +2054,7 @@ static int qca8k_read_switch_id(struct q
        if (ret < 0)
                return -ENODEV;
  
@@ -254,7 +254,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (id != data->id) {
                dev_err(priv->dev, "Switch id detected %x but expected %x", id, data->id);
                return -ENODEV;
-@@ -2050,7 +2044,7 @@ static int qca8k_read_switch_id(struct q
+@@ -2069,7 +2063,7 @@ static int qca8k_read_switch_id(struct q
        priv->switch_id = id;
  
        /* Save revision to communicate to the internal PHY driver */