diff options
| author | John Audia <graysky@archlinux.us> | 2021-08-09 10:47:18 -0400 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2021-08-14 20:25:19 +0200 |
| commit | 02e2723ef317c65b6ddfc70144b10f9936cfc2af (patch) | |
| tree | c2017456408e825752128c8c122f52437d940d7b /target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch | |
| parent | 1235e2ee3bcfb678043a0b95ff1a6d4867af2561 (diff) | |
| download | upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.tar.gz upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.tar.bz2 upstream-02e2723ef317c65b6ddfc70144b10f9936cfc2af.zip | |
kernel: bump 5.4 to 5.4.139
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch')
| -rw-r--r-- | target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch b/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch index 61a588db70..1299f3f69b 100644 --- a/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch +++ b/target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch @@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mvreg_write(pp, MVNETA_ACC_MODE, MVNETA_ACC_MODE_EXT1); netdev_info(pp->dev, "fail to update MTU, fall back to software BM\n"); } -@@ -4991,7 +4991,6 @@ static int mvneta_probe(struct platform_ +@@ -4989,7 +4989,6 @@ static int mvneta_probe(struct platform_ SET_NETDEV_DEV(dev, &pdev->dev); pp->id = global_port_id++; @@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Obtain access to BM resources if enabled and already initialized */ bm_node = of_parse_phandle(dn, "buffer-manager", 0); -@@ -5016,6 +5015,10 @@ static int mvneta_probe(struct platform_ +@@ -5014,6 +5013,10 @@ static int mvneta_probe(struct platform_ } of_node_put(bm_node); @@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> err = mvneta_init(&pdev->dev, pp); if (err < 0) goto err_netdev; -@@ -5173,6 +5176,7 @@ static int mvneta_resume(struct device * +@@ -5171,6 +5174,7 @@ static int mvneta_resume(struct device * err = mvneta_bm_port_init(pdev, pp); if (err < 0) { dev_info(&pdev->dev, "use SW buffer management\n"); |