kernel: bump 5.15 to 5.15.132

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch

diff --git a/target/linux/generic/backport-5.15/717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch b/target/linux/generic/backport-5.15/717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch
index c24bd8022c90d55998e15880c1bafb3ca2ad6633..656a60b15a2ed6c27da4effad888ad770b79dc2e 100644 (file)
--- a/target/linux/generic/backport-5.15/717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch
+++ b/target/linux/generic/backport-5.15/717-v6.0-net-ethernet-mtk_eth_soc-add-foe_entry_size-to-mtk_e.patch
@@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4165,6 +4165,7 @@ static const struct mtk_soc_data mt7621_
+@@ -4164,6 +4164,7 @@ static const struct mtk_soc_data mt7621_
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,
@@ -29,7 +29,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4184,6 +4185,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4183,6 +4184,7 @@ static const struct mtk_soc_data mt7622_
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,
@@ -37,7 +37,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4202,6 +4204,7 @@ static const struct mtk_soc_data mt7623_
+@@ -4201,6 +4203,7 @@ static const struct mtk_soc_data mt7623_
        .required_pctl = true,
        .offload_version = 2,
        .hash_offset = 2,
@@ -47,7 +47,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
                .rxd_size = sizeof(struct mtk_rx_dma),
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -965,6 +965,7 @@ struct mtk_reg_map {
+@@ -966,6 +966,7 @@ struct mtk_reg_map {
   * @required_pctl             A bool value to show whether the SoC requires
   *                            the extra setup for those pins used by GMAC.
   * @hash_offset                       Flow table hash offset.
@@ -55,7 +55,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
   * @txd_size                  Tx DMA descriptor size.
   * @rxd_size                  Rx DMA descriptor size.
   * @rx_irq_done_mask          Rx irq done register mask.
-@@ -980,6 +981,7 @@ struct mtk_soc_data {
+@@ -981,6 +982,7 @@ struct mtk_soc_data {
        bool            required_pctl;
        u8              offload_version;
        u8              hash_offset;
@@ -63,7 +63,7 @@ Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
        netdev_features_t hw_features;
        struct {
                u32     txd_size;
-@@ -1140,6 +1142,14 @@ struct mtk_mac {
+@@ -1141,6 +1143,14 @@ struct mtk_mac {
  /* the struct describing the SoC. these are declared in the soc_xyz.c files */
  extern const struct of_device_id of_mtk_match[];