-
Notifications
You must be signed in to change notification settings - Fork 19.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.51 All other patches automatically rebased. Signed-off-by: John Audia <[email protected]>
- Loading branch information
Showing
4 changed files
with
8 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.6 = .50 | ||
LINUX_KERNEL_HASH-6.6.50 = c065e36daf28210060c91a37ef3e92ac5814784e634577e04e406297ead2e86e | ||
LINUX_VERSION-6.6 = .51 | ||
LINUX_KERNEL_HASH-6.6.51 = 1c0c9a14650879c4913efdbac428ba31a540c3d987155ddf34d33e11eca008b3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ Signed-off-by: David Bauer <[email protected]> | |
#include <linux/crc32.h> | ||
#include <linux/if_vlan.h> | ||
#include <linux/uaccess.h> | ||
@@ -7035,6 +7036,22 @@ static void rtl_tally_reset(struct r8152 | ||
@@ -7044,6 +7045,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 <[email protected]> | |
static void r8152b_init(struct r8152 *tp) | ||
{ | ||
u32 ocp_data; | ||
@@ -7076,6 +7093,8 @@ static void r8152b_init(struct r8152 *tp | ||
@@ -7085,6 +7102,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 <[email protected]> | |
} | ||
|
||
static void r8153_init(struct r8152 *tp) | ||
@@ -7216,6 +7235,8 @@ static void r8153_init(struct r8152 *tp) | ||
@@ -7225,6 +7244,8 @@ static void r8153_init(struct r8152 *tp) | ||
tp->coalesce = COALESCE_SLOW; | ||
break; | ||
} | ||
|
@@ -63,7 +63,7 @@ Signed-off-by: David Bauer <[email protected]> | |
} | ||
|
||
static void r8153b_init(struct r8152 *tp) | ||
@@ -7298,6 +7319,8 @@ static void r8153b_init(struct r8152 *tp | ||
@@ -7307,6 +7328,8 @@ static void r8153b_init(struct r8152 *tp | ||
rtl_tally_reset(tp); | ||
|
||
tp->coalesce = 15000; /* 15 us */ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ip6_dst_check(struct dst_entry *, | ||
u32)); | ||
INDIRECT_CALLABLE_DECLARE(struct dst_entry *ipv4_dst_check(struct dst_entry *, | ||
@@ -2247,9 +2264,11 @@ static void __sk_free(struct sock *sk) | ||
@@ -2239,9 +2256,11 @@ static void __sk_free(struct sock *sk) | ||
if (likely(sk->sk_net_refcnt)) | ||
sock_inuse_add(sock_net(sk), -1); | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/core/sock.c | ||
+++ b/net/core/sock.c | ||
@@ -4148,6 +4148,8 @@ static __net_initdata struct pernet_oper | ||
@@ -4140,6 +4140,8 @@ static __net_initdata struct pernet_oper | ||
|
||
static int __init proto_init(void) | ||
{ | ||
|