diff options
| author | John Audia <graysky@archlinux.us> | 2021-02-17 05:58:14 -0500 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-02-18 20:04:50 +0100 |
| commit | 5d3a6fd970619dfc55f8259035c3027d7613a2a6 (patch) | |
| tree | 2a71f22994a12b2589e061d6e821c8c93fb9cb29 /target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch | |
| parent | 0db9d118657dd93509abec817eb22ce13d0ec1b6 (diff) | |
| download | upstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.tar.gz upstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.tar.bz2 upstream-5d3a6fd970619dfc55f8259035c3027d7613a2a6.zip | |
kernel: bump 5.4 to 5.4.99
Ran update_kernel.sh in a fresh clone without any existing toolchains.
No manual changes needed.
Build system: x86_64
Build-tested: bcm27xx/bcm2711
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch b/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch index dcdd279204..0e9a659f09 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch @@ -124,8 +124,8 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> + of_node_put(pf->phy_node); } - static void enetc_configure_sgmii(struct mii_bus *imdio) -@@ -888,6 +891,10 @@ static int enetc_pf_probe(struct pci_dev + /* Initialize the entire shared memory for the flow steering entries +@@ -933,6 +936,10 @@ static int enetc_pf_probe(struct pci_dev pf->si = si; pf->total_vfs = pci_sriov_get_totalvfs(pdev); @@ -136,7 +136,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> enetc_configure_port(pf); enetc_get_si_caps(si); -@@ -902,6 +909,8 @@ static int enetc_pf_probe(struct pci_dev +@@ -947,6 +954,8 @@ static int enetc_pf_probe(struct pci_dev enetc_pf_netdev_setup(si, ndev, &enetc_ndev_ops); priv = netdev_priv(ndev); @@ -145,7 +145,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> enetc_init_si_rings_params(priv); -@@ -917,10 +926,6 @@ static int enetc_pf_probe(struct pci_dev +@@ -974,10 +983,6 @@ static int enetc_pf_probe(struct pci_dev goto err_alloc_msix; } @@ -156,15 +156,15 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> err = enetc_configure_serdes(priv); if (err) dev_warn(&pdev->dev, "Attempted serdes config but failed\n"); -@@ -938,7 +943,6 @@ static int enetc_pf_probe(struct pci_dev +@@ -995,7 +1000,6 @@ static int enetc_pf_probe(struct pci_dev err_reg_netdev: enetc_mdio_remove(pf); - enetc_of_put_phy(priv); enetc_free_msix(priv); - err_alloc_msix: - enetc_free_si_resources(priv); -@@ -946,6 +950,7 @@ err_alloc_si_res: + err_init_port_rss: + err_init_port_rfs: +@@ -1005,6 +1009,7 @@ err_alloc_si_res: si->ndev = NULL; free_netdev(ndev); err_alloc_netdev: @@ -172,7 +172,7 @@ Signed-off-by: Claudiu Manoil <claudiu.manoil@nxp.com> err_map_pf_space: enetc_pci_remove(pdev); -@@ -968,7 +973,7 @@ static void enetc_pf_remove(struct pci_d +@@ -1027,7 +1032,7 @@ static void enetc_pf_remove(struct pci_d unregister_netdev(si->ndev); enetc_mdio_remove(pf); |