diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-03-23 09:47:19 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-27 16:14:00 +0100 |
commit | 1e35d95a5bfac3896df0855f13afdfe6e132d5b1 (patch) | |
tree | 109cfafa0ac59b65e57e378db31c1cda5b1cb99f /target/linux/bcm27xx/patches-5.10/950-0334-net-bcmgenet-Reset-RBUF-on-first-open.patch | |
parent | 0c49efd210a8a2502db76e4a884eedc8342a4442 (diff) | |
download | upstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.tar.gz upstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.tar.bz2 upstream-1e35d95a5bfac3896df0855f13afdfe6e132d5b1.zip |
kernel: bump 5.10 to 5.10.108
Patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Tested-by: John Audia <graysky@archlinux.us>
Build-tested: ath79/generic, ramips/mt76{20,21,x8}, ipq40xx, mvebu, realtek/rtl{838,930}x, x86/64
Run-tested: ramips/mt7621, mvebu
Tested-by: Stijn Segers <foss@volatilesystems.org>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
(cherry picked from commit 2c26eb4e484fe6d7a8159a22f97b6db7ca6e9221)
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0334-net-bcmgenet-Reset-RBUF-on-first-open.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0334-net-bcmgenet-Reset-RBUF-on-first-open.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0334-net-bcmgenet-Reset-RBUF-on-first-open.patch b/target/linux/bcm27xx/patches-5.10/950-0334-net-bcmgenet-Reset-RBUF-on-first-open.patch index 78bbc10649..184804ad50 100644 --- a/target/linux/bcm27xx/patches-5.10/950-0334-net-bcmgenet-Reset-RBUF-on-first-open.patch +++ b/target/linux/bcm27xx/patches-5.10/950-0334-net-bcmgenet-Reset-RBUF-on-first-open.patch @@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -3244,7 +3244,7 @@ static void bcmgenet_get_hw_addr(struct +@@ -3246,7 +3246,7 @@ static void bcmgenet_get_hw_addr(struct } /* Returns a reusable dma control register value */ @@ -33,7 +33,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> { unsigned int i; u32 reg; -@@ -3269,6 +3269,14 @@ static u32 bcmgenet_dma_disable(struct b +@@ -3271,6 +3271,14 @@ static u32 bcmgenet_dma_disable(struct b udelay(10); bcmgenet_umac_writel(priv, 0, UMAC_TX_FLUSH); @@ -48,7 +48,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> return dma_ctrl; } -@@ -3332,8 +3340,8 @@ static int bcmgenet_open(struct net_devi +@@ -3334,8 +3342,8 @@ static int bcmgenet_open(struct net_devi bcmgenet_set_hw_addr(priv, dev->dev_addr); @@ -59,7 +59,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); -@@ -4189,7 +4197,7 @@ static int bcmgenet_resume(struct device +@@ -4191,7 +4199,7 @@ static int bcmgenet_resume(struct device bcmgenet_hfb_create_rxnfc_filter(priv, rule); /* Disable RX/TX DMA and flush TX queues */ |