diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-03-06 00:31:31 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-03-06 15:51:54 +0100 |
| commit | 8b3d879861086fbb965f5bdb95e1286ec049c290 (patch) | |
| tree | 26cf73971458b55c9d7d0a9f377d1a96aa69074b /target/linux/mvebu/patches-5.4/015-net-mvneta-fix-XDP-support-if-sw-bm-is-used-as-fallb.patch | |
| parent | 7e1ab3b7462b11885a5b9a48804463dba465fe9a (diff) | |
| download | upstream-8b3d879861086fbb965f5bdb95e1286ec049c290.tar.gz upstream-8b3d879861086fbb965f5bdb95e1286ec049c290.tar.bz2 upstream-8b3d879861086fbb965f5bdb95e1286ec049c290.zip | |
kernel: bump 5.4 to 5.4.102
Refreshed all patches.
Compile-tested on: ath79, lantiq, ipq40xx, x86_64
Runtime-tested on: ipq40xx, x86_64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 86bffa538a..61a588db70 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"); } -@@ -4984,7 +4984,6 @@ static int mvneta_probe(struct platform_ +@@ -4991,7 +4991,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); -@@ -5009,6 +5008,10 @@ static int mvneta_probe(struct platform_ +@@ -5016,6 +5015,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; -@@ -5166,6 +5169,7 @@ static int mvneta_resume(struct device * +@@ -5173,6 +5176,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"); |