aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-10-27 06:26:25 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-01 13:56:10 +0100
commit0667688a406affbde9a2f6e2e6e07dbd0e3810b1 (patch)
treee9ad64ac22874d61ea008617aa1af9287c269a5f /target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch
parentfe58ee905755512da865aad4543da526a7adc2d4 (diff)
downloadupstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.tar.gz
upstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.tar.bz2
upstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.zip
kernel: bump 5.10 to 5.10.150
Manually rebased: bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> [Move gro_skip in 680-NET-skip-GRO-for-foreign-MAC-addresses.patch to old position] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit aa2fa2eb76f13e48cd39d844dca34627da00cb5d)
Diffstat (limited to 'target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch')
-rw-r--r--target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch
index f94d16c0ff..aa50fe17da 100644
--- a/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch
+++ b/target/linux/generic/hack-5.10/760-net-usb-r8152-add-LED-configuration-from-OF.patch
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
-@@ -5301,6 +5302,22 @@ static void rtl_tally_reset(struct r8152
+@@ -5303,6 +5304,22 @@ static void rtl_tally_reset(struct r8152
ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data);
}
@@ -45,7 +45,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
-@@ -5342,6 +5359,8 @@ static void r8152b_init(struct r8152 *tp
+@@ -5344,6 +5361,8 @@ static void r8152b_init(struct r8152 *tp
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL);
ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN);
ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
@@ -54,7 +54,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}
static void r8153_init(struct r8152 *tp)
-@@ -5487,6 +5506,8 @@ static void r8153_init(struct r8152 *tp)
+@@ -5489,6 +5508,8 @@ static void r8153_init(struct r8152 *tp)
tp->coalesce = COALESCE_SLOW;
break;
}
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}
static void r8153b_init(struct r8152 *tp)
-@@ -5573,6 +5594,8 @@ static void r8153b_init(struct r8152 *tp
+@@ -5575,6 +5596,8 @@ static void r8153b_init(struct r8152 *tp
rtl_tally_reset(tp);
tp->coalesce = 15000; /* 15 us */