[PATCH v2] ramips: fix at803x patch again

DENG Qingfang dqfext at gmail.com
Tue Jun 8 04:55:49 PDT 2021


Hi René,

On Mon, Jun 7, 2021 at 2:44 AM René van Dorst <opensource at vdorst.com> wrote:
> Thank for fixing.
> But I can't apply this patch clean on top of the current master
> 04a260911ca0f10a0e37c487c220e1aae3623dda.
> Which commit/branch are you using?

David's patches have been applied to master, you can test it now.

>
> # patch -p1 < p.patch
> patching file target/linux/ramips/patches-5.10/710-at803x.patch
> Hunk #2 FAILED at 147.
> 1 out of 2 hunks FAILED -- saving rejects to file
> target/linux/ramips/patches-5.10/710-at803x.patch.rej
> patching file target/linux/ramips/patches-5.4/991-at803x.patch
> Hunk #2 FAILED at 146.
> 1 out of 2 hunks FAILED -- saving rejects to file
> target/linux/ramips/patches-5.4/991-at803x.patch.rej
>
>
> # cat target/linux/ramips/patches-5.10/710-at803x.patch.rej
> --- target/linux/ramips/patches-5.10/710-at803x.patch
> +++ target/linux/ramips/patches-5.10/710-at803x.patch
> @@ -147,3 +147,12 @@ Signed-off-by: René van Dorst <opensource at vdorst.com>
>            .flags                        = PHY_POLL_CABLE_TEST,
>            .probe                        = at803x_probe,
>            .remove                        = at803x_remove,
> +@@ -1119,7 +1203,7 @@ static struct phy_driver at803x_driver[]
> +         .get_wol                = at803x_get_wol,
> +         .suspend                = at803x_suspend,
> +         .resume                        = at803x_resume,
> +-        .features               = PHY_GBIT_FEATURES,
> ++        /* PHY_GBIT_FEATURES */
> +         .read_status                = at803x_read_status,
> +         .aneg_done                = at803x_aneg_done,
> +         .ack_interrupt                = &at803x_ack_interrupt,
>
> Greats,
>
> René
>



More information about the openwrt-devel mailing list