kernel: bump 6.1 to 6.1.60

[openwrt/staging/hauke.git] / target / linux / generic / hack-6.1 / 902-debloat_proc.patch

diff --git a/target/linux/generic/hack-6.1/902-debloat_proc.patch b/target/linux/generic/hack-6.1/902-debloat_proc.patch
index b035f04ba2381b57b49cb6f7a808d4c2d2dcc555..a5db9b21c1bebef9abb936a089547fd851b78bcb 100644 (file)
--- a/target/linux/generic/hack-6.1/902-debloat_proc.patch
+++ b/target/linux/generic/hack-6.1/902-debloat_proc.patch
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (!pe)
 --- a/mm/vmalloc.c
 +++ b/mm/vmalloc.c
-@@ -4183,6 +4183,8 @@ static const struct seq_operations vmall
+@@ -4205,6 +4205,8 @@ static const struct seq_operations vmall
  
  static int __init proc_vmalloc_init(void)
  {
@@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/core/sock.c
 +++ b/net/core/sock.c
-@@ -4093,6 +4093,8 @@ static __net_initdata struct pernet_oper
+@@ -4105,6 +4105,8 @@ static __net_initdata struct pernet_oper
  
  static int __init proto_init(void)
  {
@@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/ipv4/fib_trie.c
 +++ b/net/ipv4/fib_trie.c
-@@ -3031,11 +3031,13 @@ static const struct seq_operations fib_r
+@@ -3036,11 +3036,13 @@ static const struct seq_operations fib_r
  
  int __net_init fib_proc_init(struct net *net)
  {
@@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
                        fib_triestat_seq_show, NULL))
                goto out2;
  
-@@ -3046,17 +3048,21 @@ int __net_init fib_proc_init(struct net
+@@ -3051,17 +3053,21 @@ int __net_init fib_proc_init(struct net
        return 0;
  
  out3:
@@ -406,3 +406,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        return register_pernet_subsys(&ip_rt_proc_ops);
  }
  
+--- a/net/ipv4/inet_timewait_sock.c
++++ b/net/ipv4/inet_timewait_sock.c
+@@ -269,7 +269,7 @@ void __inet_twsk_schedule(struct inet_ti
+        */
+ 
+       if (!rearm) {
+-              bool kill = timeo <= 4*HZ;
++              bool __maybe_unused  kill = timeo <= 4*HZ;
+ 
+               __NET_INC_STATS(twsk_net(tw), kill ? LINUX_MIB_TIMEWAITKILLED :
+                                                    LINUX_MIB_TIMEWAITED);