kernel: bump 5.15 to 5.15.125

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 776-v6.1-01-net-dsa-qca8k-fix-inband-mgmt-for-big-endian-systems.patch

diff --git a/target/linux/generic/backport-5.15/776-v6.1-01-net-dsa-qca8k-fix-inband-mgmt-for-big-endian-systems.patch b/target/linux/generic/backport-5.15/776-v6.1-01-net-dsa-qca8k-fix-inband-mgmt-for-big-endian-systems.patch
index e706874a6a9472d3a7a210394caed1fed6e09cd8..4f0d95f456106a2479528860e07a8e3f272c22f2 100644 (file)
--- a/target/linux/generic/backport-5.15/776-v6.1-01-net-dsa-qca8k-fix-inband-mgmt-for-big-endian-systems.patch
+++ b/target/linux/generic/backport-5.15/776-v6.1-01-net-dsa-qca8k-fix-inband-mgmt-for-big-endian-systems.patch
@@ -22,11 +22,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  include/linux/dsa/tag_qca.h      |  6 +--
  2 files changed, 50 insertions(+), 19 deletions(-)
 
-diff --git a/drivers/net/dsa/qca/qca8k-8xxx.c b/drivers/net/dsa/qca/qca8k-8xxx.c
-index 5669c92c93f7..644338ca0510 100644
 --- a/drivers/net/dsa/qca/qca8k-8xxx.c
 +++ b/drivers/net/dsa/qca/qca8k-8xxx.c
-@@ -137,27 +137,42 @@ static void qca8k_rw_reg_ack_handler(struct dsa_switch *ds, struct sk_buff *skb)
+@@ -137,27 +137,42 @@ static void qca8k_rw_reg_ack_handler(str
        struct qca8k_mgmt_eth_data *mgmt_eth_data;
        struct qca8k_priv *priv = ds->priv;
        struct qca_mgmt_ethhdr *mgmt_ethhdr;
@@ -76,7 +74,7 @@ index 5669c92c93f7..644338ca0510 100644
        }
  
        complete(&mgmt_eth_data->rw_done);
-@@ -169,8 +184,10 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *
+@@ -169,8 +184,10 @@ static struct sk_buff *qca8k_alloc_mdio_
        struct qca_mgmt_ethhdr *mgmt_ethhdr;
        unsigned int real_len;
        struct sk_buff *skb;
@@ -88,7 +86,7 @@ index 5669c92c93f7..644338ca0510 100644
  
        skb = dev_alloc_skb(QCA_HDR_MGMT_PKT_LEN);
        if (!skb)
-@@ -199,20 +216,32 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *
+@@ -199,20 +216,32 @@ static struct sk_buff *qca8k_alloc_mdio_
        hdr |= FIELD_PREP(QCA_HDR_XMIT_DP_BIT, BIT(0));
        hdr |= FIELD_PREP(QCA_HDR_XMIT_CONTROL, QCA_HDR_XMIT_TYPE_RW_REG);
  
@@ -128,7 +126,7 @@ index 5669c92c93f7..644338ca0510 100644
  
        return skb;
  }
-@@ -220,9 +249,11 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *
+@@ -220,9 +249,11 @@ static struct sk_buff *qca8k_alloc_mdio_
  static void qca8k_mdio_header_fill_seq_num(struct sk_buff *skb, u32 seq_num)
  {
        struct qca_mgmt_ethhdr *mgmt_ethhdr;
@@ -141,11 +139,9 @@ index 5669c92c93f7..644338ca0510 100644
  }
  
  static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)
-diff --git a/include/linux/dsa/tag_qca.h b/include/linux/dsa/tag_qca.h
-index 50be7cbd93a5..0e176da1e43f 100644
 --- a/include/linux/dsa/tag_qca.h
 +++ b/include/linux/dsa/tag_qca.h
-@@ -61,9 +61,9 @@ struct sk_buff;
+@@ -56,9 +56,9 @@
  
  /* Special struct emulating a Ethernet header */
  struct qca_mgmt_ethhdr {
@@ -158,6 +154,3 @@ index 50be7cbd93a5..0e176da1e43f 100644
        __be16 hdr;             /* qca hdr */
  } __packed;
  
--- 
-2.37.2
-