kernel: bump 6.1 to 6.1.130

This commit is contained in:
coolsnowwolf 2025-03-13 12:57:08 +08:00
parent 0c58045b0e
commit 74aa05a408
3 changed files with 7 additions and 7 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .128
LINUX_KERNEL_HASH-6.1.128 = 874d67d3181570e69ac6b33853f0448f05fc90d4cf3e4baaadc4a9cede7c50f3
LINUX_VERSION-6.1 = .130
LINUX_KERNEL_HASH-6.1.130 = 9416b2c2d448ec7f54bb0ce5713fb34c32dae4a4edf1abd8cf7a8995cbac66fd

View File

@ -178,9 +178,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -30,6 +30,7 @@ static int min_sndbuf = SOCK_MIN_SNDBUF;
static int min_rcvbuf = SOCK_MIN_RCVBUF;
static int max_skb_frags = MAX_SKB_FRAGS;
static int min_mem_pcpu_rsv = SK_MEMORY_PCPU_RESERVE;
static int netdev_budget_usecs_min = 2 * USEC_PER_SEC / HZ;
+static int backlog_threaded;
static int net_msg_warn; /* Unused, but still a sysctl */

View File

@ -519,8 +519,8 @@
+
+ mrt->vif_table[vif].pkt_in += pkts_in;
+ mrt->vif_table[vif].bytes_in += bytes_in;
+ cache->_c.mfc_un.res.pkt += pkts_out;
+ cache->_c.mfc_un.res.bytes += bytes_out;
+ atomic_long_add(pkts_out, &cache->_c.mfc_un.res.pkt);
+ atomic_long_add(bytes_out, &cache->_c.mfc_un.res.bytes);
+
+ for (vifi = cache->_c.mfc_un.res.minvif;
+ vifi < cache->_c.mfc_un.res.maxvif; vifi++) {
@ -806,8 +806,8 @@
+
+ mrt->vif_table[vif].pkt_in += pkts_in;
+ mrt->vif_table[vif].bytes_in += bytes_in;
+ cache->_c.mfc_un.res.pkt += pkts_out;
+ cache->_c.mfc_un.res.bytes += bytes_out;
+ atomic64_add(pkts_out, &cache->_c.mfc_un.res.pkt);
+ atomic64_add(bytes_out, &cache->_c.mfc_un.res.bytes);
+
+ for (vifi = cache->_c.mfc_un.res.minvif;
+ vifi < cache->_c.mfc_un.res.maxvif; vifi++) {