kernel: bump 5.10 to 5.10.115

[openwrt/openwrt.git] / target / linux / generic / backport-5.10 / 732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch

diff --git a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
index bc7b2b3b1001f9b9a1ca9fd0f9a769b95a80ab5f..a4a9f5624ec993d96aed6b9dcbac879cd142c6bb 100644 (file)
--- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
+++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
@@ -1327,7 +1327,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c
-@@ -1202,7 +1202,7 @@ static int sun8i_dwmac_probe(struct plat
+@@ -1203,7 +1203,7 @@ static int sun8i_dwmac_probe(struct plat
        if (ret)
                return -EINVAL;
  
@@ -1478,7 +1478,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                        if (ret)
 --- a/drivers/net/ethernet/ti/cpsw_new.c
 +++ b/drivers/net/ethernet/ti/cpsw_new.c
-@@ -1267,7 +1267,6 @@ static int cpsw_probe_dt(struct cpsw_com
+@@ -1269,7 +1269,6 @@ static int cpsw_probe_dt(struct cpsw_com
  
        for_each_child_of_node(tmp_node, port_np) {
                struct cpsw_slave_data *slave_data;
@@ -1486,7 +1486,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                u32 port_id;
  
                ret = of_property_read_u32(port_np, "reg", &port_id);
-@@ -1326,10 +1325,8 @@ static int cpsw_probe_dt(struct cpsw_com
+@@ -1328,10 +1327,8 @@ static int cpsw_probe_dt(struct cpsw_com
                        goto err_node_put;
                }
  
@@ -1641,7 +1641,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;
 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
 +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
-@@ -1113,7 +1113,6 @@ static int xemaclite_of_probe(struct pla
+@@ -1122,7 +1122,6 @@ static int xemaclite_of_probe(struct pla
        struct net_device *ndev = NULL;
        struct net_local *lp = NULL;
        struct device *dev = &ofdev->dev;
@@ -1649,7 +1649,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        int rc = 0;
  
-@@ -1155,12 +1154,9 @@ static int xemaclite_of_probe(struct pla
+@@ -1164,12 +1163,9 @@ static int xemaclite_of_probe(struct pla
        lp->next_rx_buf_to_use = 0x0;
        lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong");
        lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");